diff --git a/config/alfresco/web-scripts-application-context.xml b/config/alfresco/web-scripts-application-context.xml
index f9fa0b832d..3d64d1b0cc 100644
--- a/config/alfresco/web-scripts-application-context.xml
+++ b/config/alfresco/web-scripts-application-context.xml
@@ -247,47 +247,27 @@
    </bean>
    
    
-   <!--  AVM Remote Store -->
-   <!--  bean id="AVMStoreBean" class="org.alfresco.repo.web.scripts.bean.AVMRemoteStore">
-      <property name="mimetypeService" ref="MimetypeService" />
-      <property name="avmService" ref="AVMService" />
-      <property name="searchService" ref="SearchService" />
-   </bean>
-   -->
-   
    <!--  Remote Store service - AVM -->
    <bean id="webscript.org.alfresco.repository.store.remoteavm.get" class="org.alfresco.repo.web.scripts.bean.AVMRemoteStore" parent="webscript">
       <property name="mimetypeService" ref="MimetypeService" />
       <property name="avmService" ref="AVMService" />
       <property name="searchService" ref="SearchService" />
-      <!--
-      <property name="rootPath"><value>alfresco</value></property>
-      <property name="store"><value>sitestore</value></property>
-      -->
    </bean>
    <bean id="webscript.org.alfresco.repository.store.remoteavm.post" class="org.alfresco.repo.web.scripts.bean.AVMRemoteStore" parent="webscript">
       <property name="mimetypeService" ref="MimetypeService" />
       <property name="avmService" ref="AVMService" />
       <property name="searchService" ref="SearchService" />
-      <!--
-      <property name="rootPath"><value>alfresco</value></property>
-      <property name="store"><value>sitestore</value></property>
-      -->
    </bean>
    <bean id="webscript.org.alfresco.repository.store.remoteavm.delete" class="org.alfresco.repo.web.scripts.bean.AVMRemoteStore" parent="webscript">
       <property name="mimetypeService" ref="MimetypeService" />
       <property name="avmService" ref="AVMService" />
       <property name="searchService" ref="SearchService" />
-      <!--
-      <property name="rootPath"><value>alfresco</value></property>
-      <property name="store"><value>sitestore</value></property>
-      -->
    </bean>
    
    <!-- Web-tier SSO authentication touch point -->
    <bean id="webscript.org.alfresco.repository.touch.get" class="org.alfresco.repo.web.scripts.bean.Touch" parent="webscript" />
-
-
+   
+   
    <!--                            -->
    <!-- Activity Feed Web Scripts  -->
    <!--                            -->
diff --git a/source/java/org/alfresco/repo/web/scripts/bean/AVMRemoteStore.java b/source/java/org/alfresco/repo/web/scripts/bean/AVMRemoteStore.java
index c29b27f42c..9319a86200 100644
--- a/source/java/org/alfresco/repo/web/scripts/bean/AVMRemoteStore.java
+++ b/source/java/org/alfresco/repo/web/scripts/bean/AVMRemoteStore.java
@@ -77,9 +77,9 @@ public class AVMRemoteStore extends BaseRemoteStore
      */
     public void setRootPath(String rootPath)
     {
-        if (rootPath != null && rootPath.length() == 0)
+        if (rootPath == null || rootPath.length() == 0)
         {
-            rootPath = "/";
+            throw new IllegalArgumentException("Root path must be specified.");
         }
         
         this.rootPath = rootPath;
diff --git a/source/java/org/alfresco/repo/web/scripts/bean/BaseRemoteStore.java b/source/java/org/alfresco/repo/web/scripts/bean/BaseRemoteStore.java
index 97cdee6d00..841b4f26b2 100644
--- a/source/java/org/alfresco/repo/web/scripts/bean/BaseRemoteStore.java
+++ b/source/java/org/alfresco/repo/web/scripts/bean/BaseRemoteStore.java
@@ -227,7 +227,7 @@ public abstract class BaseRemoteStore extends AbstractWebScript
         String path = pathBuilder.toString();
         
         if (logger.isDebugEnabled())
-        	logger.debug("Remote method: " + methodName + " Store Id: " + store + " Path: " + path);
+        	logger.debug("Remote method: " + methodName.toUpperCase() + "   Store Id: " + store + "   Path: " + path);
         
         try
         {