diff --git a/config/alfresco/templates/webscripts/org/alfresco/webframework/metadata.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/webframework/metadata.get.html.ftl
index 75927fea79..5dcf4efbb0 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/webframework/metadata.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/webframework/metadata.get.html.ftl
@@ -1,5 +1,12 @@
 {
-	<@serialize object=object includeChildren=includeChildren includeContent=includeContent/>
+	"code" : "${code}"
+
+<#if object?exists>
+	,
+	"data" : {
+		<@serialize object=object includeChildren=includeChildren includeContent=includeContent/>
+	}
+</#if>
 }
 
 <#macro serialize object includeChildren includeContent>
@@ -10,10 +17,10 @@
 	"url" : "${object.url}"
 	,
 	"downloadUrl" : "${object.downloadUrl}"
-<#if object.mimetype?exists>	
+<#if object.mimetype?exists>
 	,
 	"mimetype" : "${object.mimetype}"
-</#if>	
+</#if>
 	,
 	"size" : "${object.size}"
 	,
@@ -36,7 +43,7 @@
 	"type" : "${object.type}"
 	,
 	"isCategory" : ${object.isCategory?string}
-	
+
 <#if object.properties?exists>
 	,
 	"properties" :
@@ -86,7 +93,7 @@
 		{
 			<@serialize object=child includeChildren=false includeContent=includeContent/>
 		}
-			<#assign first = false>	
+			<#assign first = false>
 		</#list>
 	]
 <#else>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/webframework/metadata.get.js b/config/alfresco/templates/webscripts/org/alfresco/webframework/metadata.get.js
index a2f76d36b3..6372d54457 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/webframework/metadata.get.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/webframework/metadata.get.js
@@ -2,6 +2,8 @@ model.includeChildren = true;
 model.includeContent = false;
 model.isUser = false;
 
+model.code = "ERROR";
+
 var object = null;
 
 // allow for content to be loaded from id
@@ -35,4 +37,9 @@ else
 	object = roothome.childByNamePath(path);
 }
 
+if (object != null)
+{
+	model.code = "OK";
+}
+
 model.object = object;
\ No newline at end of file
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 7d95925b61..688a3cce76 100644
--- a/source/java/org/alfresco/repo/web/scripts/bean/BaseRemoteStore.java
+++ b/source/java/org/alfresco/repo/web/scripts/bean/BaseRemoteStore.java
@@ -146,7 +146,7 @@ public abstract class BaseRemoteStore extends AbstractWebScript
         String methodName = null;
         String store = null;
         String webapp = null;
-        StringBuilder pathBuilder = null;
+        StringBuilder pathBuilder = new StringBuilder(128);
         
         // tokenize the path and figure out tokenized values
         StringTokenizer tokenizer = new StringTokenizer(extPath, "/");
@@ -178,10 +178,6 @@ public abstract class BaseRemoteStore extends AbstractWebScript
         		
         		while (el != null)
         		{
-        			if (pathBuilder == null)
-        			{
-        				pathBuilder = new StringBuilder(128);
-        			}
         			pathBuilder.append('/');
         			pathBuilder.append(el);