diff --git a/bundles/nl.esi.xplus.doc.design/pom.xml b/bundles/nl.esi.xplus.doc.design/pom.xml
index bb15907..4cbafe4 100644
--- a/bundles/nl.esi.xplus.doc.design/pom.xml
+++ b/bundles/nl.esi.xplus.doc.design/pom.xml
@@ -100,6 +100,7 @@
                         <configuration>
                             <mainClass>nl.esi.xplus.doc.design.GenerateGrammarsDiagram</mainClass>
                             <includePluginDependencies>true</includePluginDependencies>
+                            <classpathScope>provided</classpathScope>
                             <arguments>
                                 <argument>${project.build.directory}/meta-models</argument>
                                 <argument>${project.build.directory}/adoc-gen/xtext-grammars.plantuml</argument>
@@ -108,14 +109,6 @@
                         </configuration>
                     </execution>
                 </executions>
-                <dependencies>
-                    <!-- Don't know why this dependency is not picked up from the MANIFEST.MF -->
-                    <dependency>
-                        <groupId>org.eclipse.xtend</groupId>
-                        <artifactId>org.eclipse.xtend.lib</artifactId>
-                        <version>${xtend.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
 
             <plugin>
diff --git a/bundles/nl.esi.xplus.doc.design/src/nl/esi/xplus/doc/design/GenerateGrammarsDiagram.xtend b/bundles/nl.esi.xplus.doc.design/src/nl/esi/xplus/doc/design/GenerateGrammarsDiagram.xtend
index 5814432..1e8a3b0 100644
--- a/bundles/nl.esi.xplus.doc.design/src/nl/esi/xplus/doc/design/GenerateGrammarsDiagram.xtend
+++ b/bundles/nl.esi.xplus.doc.design/src/nl/esi/xplus/doc/design/GenerateGrammarsDiagram.xtend
@@ -125,7 +125,9 @@ class GenerateGrammarsDiagram {
             g.parent = xtextLines.matchAndReturn(GRAMMAR_PATTERN, '$4').head
             g.uri = xtextLines.matchAndReturn(GENERATE_PATTERN, '$2').head
             g.grammarUses += xtextLines.matchAndReturn(IMPORT_PATTERN, '$1')
-            g.bundleUses += requiredBundles.split(',').map[split(';').head]
+            if (!requiredBundles.isNullOrEmpty) {
+                g.bundleUses += requiredBundles.split(',').map[split(';').head]
+            }
             g.fileExtensions = fileExtensions
         ]
     }