diff --git a/config/alfresco/model/wcmAppModel.xml b/config/alfresco/model/wcmAppModel.xml
index 1918a09e2b..bc62ac90b5 100644
--- a/config/alfresco/model/wcmAppModel.xml
+++ b/config/alfresco/model/wcmAppModel.xml
@@ -182,6 +182,10 @@
 	</types>
 
 	<aspects>
+
+      <aspect name="wca:webapp">
+	<title>Webapp</title>
+      </aspect>
    
       <aspect name="wca:filenamepattern">
          <title>Filename Pattern</title>
diff --git a/source/java/org/alfresco/model/WCMAppModel.java b/source/java/org/alfresco/model/WCMAppModel.java
index a6ff158a9e..a9fcf271df 100644
--- a/source/java/org/alfresco/model/WCMAppModel.java
+++ b/source/java/org/alfresco/model/WCMAppModel.java
@@ -55,6 +55,9 @@ public interface WCMAppModel
     // AVM web workflow defaults
     static final QName TYPE_WEBWORKFLOWDEFAULTS = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "webworkflowdefaults");
     
+    // AVM webapp aspect
+    static final QName ASPECT_WEBAPP = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "webapp");
+
     // AVM filename pattern aspect
     static final QName ASPECT_FILENAMEPATTERN = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "filenamepattern");
     static final QName PROP_FILENAMEPATTERN = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "filenamepattern");
diff --git a/source/java/org/alfresco/repo/avm/AVMNodeConverter.java b/source/java/org/alfresco/repo/avm/AVMNodeConverter.java
index 0a273e6113..eb9035abf5 100644
--- a/source/java/org/alfresco/repo/avm/AVMNodeConverter.java
+++ b/source/java/org/alfresco/repo/avm/AVMNodeConverter.java
@@ -43,7 +43,7 @@ public class AVMNodeConverter
         String [] pathParts = avmPath.split(":");
         if (pathParts.length != 2)
         {
-            throw new AVMException("Malformed AVM Path.");
+            throw new AVMException("Malformed AVM Path: " + avmPath);
         }
         while (pathParts[1].endsWith("/") && pathParts[1].length() > 1)
         {
@@ -79,7 +79,7 @@ public class AVMNodeConverter
         if (off == -1)
         {
             fgLogger.error(translated);
-            throw new AVMException("Bad Node Reference.");
+            throw new AVMException("Bad Node Reference: " + nodeRef.getId());
         }
         int version = Integer.parseInt(translated.substring(0, off));
         String path = translated.substring(off);
@@ -119,15 +119,12 @@ public class AVMNodeConverter
         }
         if (path.endsWith(":/"))
         {
-            String [] res = new String[2];
-            res[0] = null;
-            res[1] = "";
-            return res;
+           return new String[] { null, "" };
         }
         int off = path.lastIndexOf("/");
         if (off == -1)
         {
-            throw new AVMException("Invalid Path.");
+            throw new AVMException("Invalid Path: " + path);
         }
         String [] decomposed = new String[2];
         decomposed[0] = path.substring(0, off);