diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
index 890788f..a8fcc82 100644
--- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
+++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
@@ -277,7 +277,7 @@ public class PluginReport
 
             if ( !( pluginDescriptor.getMojos() != null && pluginDescriptor.getMojos().size() > 0 ) )
             {
-                paragraph( getBundle( locale ).getString( "report.plugin.nogoal" ) );
+                paragraph( getBundle( locale ).getString( "report.plugin.goals.nogoal" ) );
                 endSection();
                 return;
             }
diff --git a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
index 8f31185..9f8ca2f 100644
--- a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
+++ b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
@@ -93,10 +93,13 @@ public class PluginXdocGenerator
     public void execute( File destinationDirectory, PluginDescriptor pluginDescriptor )
         throws IOException
     {
-        for ( Iterator it = pluginDescriptor.getMojos().iterator(); it.hasNext(); )
+        if ( pluginDescriptor.getMojos() != null )
         {
-            MojoDescriptor descriptor = (MojoDescriptor) it.next();
-            processMojoDescriptor( descriptor, destinationDirectory );
+            for ( Iterator it = pluginDescriptor.getMojos().iterator(); it.hasNext(); )
+            {
+                MojoDescriptor descriptor = (MojoDescriptor) it.next();
+                processMojoDescriptor( descriptor, destinationDirectory );
+            }
         }
     }
 
diff --git a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScannerTest.java b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScannerTest.java
index 5600c5f..27f731c 100644
--- a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScannerTest.java
+++ b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScannerTest.java
@@ -192,7 +192,7 @@ public class DefaultMojoScannerTest
                         remainingGoals.remove( desc.getGoal() ) );
         }
 
-        assertTrue( "Extpected goals missing from PluginDescriptor: " + remainingGoals, remainingGoals.size() == 0 );
+        assertTrue( "Expected goals missing from PluginDescriptor: " + remainingGoals, remainingGoals.size() == 0 );
     }
 
 }
\ No newline at end of file