diff --git a/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrIndex.java b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrIndex.java
index 9abfc47..6bfbb45 100644
--- a/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrIndex.java
+++ b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrIndex.java
@@ -109,7 +109,7 @@
                 }
                 catch (Exception e)
                 {
-                    log.warn("Error processing bundle: " + file, e);
+                    log.warn("Error processing bundle: " + file + " " + e.getMessage());
                 }
             }
             Writer writer = new FileWriter( new File(repositoryXml) );
@@ -178,7 +178,7 @@
                 finalUri = sb.toString();
             }
         }
-        else
+        else if (urlTemplate != null)
         {
             String dir = path.getParentFile().toURI().toURL().toString();
             if (dir.endsWith("/"))
@@ -199,9 +199,8 @@
     private final FileFilter filter = new FileFilter() {
 
         public boolean accept(File pathname) {
-            return pathname.getName().endsWith(".jar");
+            return pathname.getName().endsWith("ar");
         }
-
     };
 
 
