diff --git a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixSuppressProblem.java b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixSuppressProblem.java
index 8045c926385..f6f35e51042 100644
--- a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixSuppressProblem.java
+++ b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixSuppressProblem.java
@@ -64,7 +64,10 @@ public class QuickFixSuppressProblem extends AbstractAstRewriteQuickFix implemen
 
 	@Override
 	public void prepareFor(IMarker marker) {
-		problemName = getProblem(marker).getName();
+		IProblem problem = getProblem(marker);
+		if (problem != null) {
+			problemName = problem.getName();
+		}
 	}
 
 	@Override