diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassCodeGenerator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassCodeGenerator.java
index 54c82f79ec8..e9438eaa4f6 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassCodeGenerator.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassCodeGenerator.java
@@ -467,9 +467,11 @@ public class NewClassCodeGenerator {
 		String body = constructMethodDeclarations(tu, publicMethods, protectedMethods,
 				privateMethods, lineDelimiter);
         body = CodeGeneration.getClassBodyContent(tu, fClassName, body, lineDelimiter);
-        code.append(body);
-        if (!body.endsWith(lineDelimiter)) {
-        	code.append(lineDelimiter);
+        if (body != null) {
+	        code.append(body);
+	        if (!body.endsWith(lineDelimiter)) {
+	        	code.append(lineDelimiter);
+	        }
         }
         code.append("};"); //$NON-NLS-1$
         return removeRedundantVisibilityLabels(code.toString());