diff --git a/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeErrorParser.java b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeErrorParser.java
index b4f8e935220..e15cd609dc5 100644
--- a/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeErrorParser.java
+++ b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeErrorParser.java
@@ -205,6 +205,10 @@ import org.eclipse.core.runtime.Status;
 		 */
 		public void processMessage(ICMakeExecutionMarkerFactory markerFactory, String fullMessage)
 				throws CoreException {
+			int length = getMessageStart().length();
+			if (fullMessage.length() <= length) {
+				return;
+			}
 			String content = fullMessage.substring(getMessageStart().length());
 			// mandatory attributes for the marker
 			Map<String, Object> attributes = new HashMap<>(3);
diff --git a/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/ICMakeExecutionMarkerFactory.java b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/ICMakeExecutionMarkerFactory.java
index b6283f2c517..1380cf44714 100644
--- a/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/ICMakeExecutionMarkerFactory.java
+++ b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/ICMakeExecutionMarkerFactory.java
@@ -50,7 +50,6 @@ interface ICMakeExecutionMarkerFactory {
 	 *
 	 * @throws CoreException
 	 */
-	// TODO pass in the extra attributes here then return void
 	void createMarker(String message, int severity, String filePath, Map<String, Object> mandatoryAttributes)
 			throws CoreException;
 }
\ No newline at end of file