diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/quickfix/QuickfixProviderFragment2.xtend b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/quickfix/QuickfixProviderFragment2.xtend
index aa860eb64..92e7e9f74 100644
--- a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/quickfix/QuickfixProviderFragment2.xtend
+++ b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/quickfix/QuickfixProviderFragment2.xtend
@@ -76,20 +76,20 @@ class QuickfixProviderFragment2 extends AbstractGeneratorFragment2 {
 					instanceClass
 				).contributeTo(language.eclipsePluginGenModule);
 
-		if (!generateStub) {
-			return;
-		}
-
-		if (projectConfig.eclipsePluginSrc !== null) {
+		if (generateStub && projectConfig.eclipsePluginSrc !== null) {
 			if (preferXtendStubs) {
 				generateXtendQuickfixProvider
 			} else {
 				generateJavaQuickfixProvider
 			}
 
-			projectConfig.eclipsePluginManifest.exportedPackages += grammar.quickfixProviderClass.packageName
+			if (projectConfig.eclipsePluginManifest != null) {
+				projectConfig.eclipsePluginManifest.exportedPackages += grammar.quickfixProviderClass.packageName
+			}
 
-			addRegistrationToPluginXml
+			if (projectConfig.eclipsePluginPluginXml != null) {
+				addRegistrationToPluginXml
+			}
 		}
 	}