diff --git a/job.cpp b/job.cpp
--- a/job.cpp
+++ b/job.cpp
@@ -116,8 +116,10 @@
 
     /* extra parameters */
     QString cppcheckParameters(parameters.parameters);
-    if (!cppcheckParameters.isEmpty())
-        args.append(cppcheckParameters);
+    if (!cppcheckParameters.isEmpty()) {
+        QStringList sa = KShell::splitArgs(cppcheckParameters);
+        args.append(sa);
+    }
 
     if (parameters.checkStyle)
         args.append("--enable=style");
diff --git a/parsers/cppcheckparser.cpp b/parsers/cppcheckparser.cpp
--- a/parsers/cppcheckparser.cpp
+++ b/parsers/cppcheckparser.cpp
@@ -83,9 +83,12 @@
             for (int i = 0; i < KDevelop::ICore::self()->projectController()->projects().count(); i++) {
                 if (KDevelop::ICore::self()->projectController()->findProjectForUrl(QUrl::fromLocalFile(ErrorFile)) != 0) {
                     ProjectPath = KDevelop::ICore::self()->projectController()->projects().at(i)->path().toUrl().toLocalFile();
+                    QString tmp(ErrorFile);
+                    ErrorFile.remove(ProjectPath);
+                    if (tmp == ProjectPath + ErrorFile)
+                        break; // We found our project
                 }
             }
-            ErrorFile.remove(ProjectPath);
         }
     } else if (name() == "error") {
         newState = Error;