Index: LocatorFactoryImpl.java
===================================================================
--- LocatorFactoryImpl.java	(revision 1213694)
+++ LocatorFactoryImpl.java	(working copy)
@@ -46,7 +46,7 @@
                 href = href.substring(prefix.length());
             }
         }
-        if (repositoryPrefix != null && repositoryPrefix.length() > 0 && !prefix.endsWith(repositoryPrefix)) {
+        if (repositoryPrefix != null && repositoryPrefix.length() > 0 && (prefix==null||!prefix.endsWith(repositoryPrefix))) {
             b.append(repositoryPrefix);
             if (href.startsWith(repositoryPrefix)) {
                 href = href.substring(repositoryPrefix.length());