diff --git a/src/content/content-type.cpp b/src/content/content-type.cpp
index 6036f3d46..4af2f2195 100644
--- a/src/content/content-type.cpp
+++ b/src/content/content-type.cpp
@@ -75,7 +75,7 @@ ContentType::ContentType (const string &contentType) : ClonableObject(*new Conte
 		string token;
 		do {
 			posParam = params.find(";");
-			if (posParam != string::npos) {
+			if (posParam == string::npos) {
 				token = params;
 			} else {
 				token = params.substr(0, posParam);
diff --git a/src/content/header-param.cpp b/src/content/header-param.cpp
index cbc07d8a7..9605a2f84 100644
--- a/src/content/header-param.cpp
+++ b/src/content/header-param.cpp
@@ -46,7 +46,7 @@ HeaderParam::HeaderParam (const string &param) : ClonableObject(*new HeaderParam
 		setName(param);
 	} else {
 		setName(param.substr(0, pos));
-		setValue(param.substr(pos + 1, end));
+		setValue(param.substr(pos + 1, end - (pos + 1)));
 	}
 }