Index: src/main/java/org/codehaus/mojo/nbm/PopulateRepositoryMojo.java
===================================================================
--- src/main/java/org/codehaus/mojo/nbm/PopulateRepositoryMojo.java	(revision 12377)
+++ src/main/java/org/codehaus/mojo/nbm/PopulateRepositoryMojo.java	(working copy)
@@ -410,7 +410,7 @@
                     if ( zip.exists() )
                     {
                         javadoc = zip;
-                        javadocArt = createAttachedArtifact(art, javadoc, null, "javadoc");
+                        javadocArt = createAttachedArtifact(art, javadoc, "jar", "javadoc");
                     }
                 }
                 File source = null;
@@ -421,7 +421,7 @@
                     if ( zip.exists() )
                     {
                         source = zip;
-                        sourceArt = createAttachedArtifact(art, source, null, "sources");
+                        sourceArt = createAttachedArtifact(art, source, "jar", "sources");
                     }
                 }
                 File nbm = null;
@@ -604,10 +604,7 @@
 
         ArtifactHandler handler = null;
 
-        if ( type != null )
-        {
-            handler = artifactHandlerManager.getArtifactHandler( type );
-        }
+        handler = artifactHandlerManager.getArtifactHandler( type );
 
         if ( handler == null )
         {