diff --git a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/CodanProblemMarkerResolutionGenerator.java b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/CodanProblemMarkerResolutionGenerator.java
index a02446a0624..7931a8c3b14 100644
--- a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/CodanProblemMarkerResolutionGenerator.java
+++ b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/CodanProblemMarkerResolutionGenerator.java
@@ -84,6 +84,8 @@ public class CodanProblemMarkerResolutionGenerator implements IMarkerResolutionG
 			int n = matcher.groupCount();
 			if (n == 0)
 				return;
+			if (!matcher.matches())
+				return;
 			String[] res = new String[n];
 			for (int i = 0; i < n; i++) {
 				res[i] = matcher.group(i + 1);