diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/node-browser/node-browser.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/slingshot/node-browser/node-browser.get.desc.xml
index e7e1e5d7c4..4604f4bf96 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/node-browser/node-browser.get.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/node-browser/node-browser.get.desc.xml
@@ -1,9 +1,10 @@
 <webscript>
    <shortname>Node Browser Repository support</shortname>
-   <description>Execute searches, return information on a node and return a list of stores</description>
+   <description>Execute searches, return information on a node or return a list of stores</description>
    <url>/slingshot/node/{protocol}/{store}/{id}</url>
    <url>/slingshot/node/search</url>
    <url>/slingshot/node/stores</url>
    <format default="json">argument</format>
    <authentication>admin</authentication>
+   <transaction allow="readonly">required</transaction>
 </webscript>
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/node-browser/node-browser.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/slingshot/node-browser/node-browser.get.json.ftl
index 74c04d8530..47c35a8f23 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/node-browser/node-browser.get.json.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/node-browser/node-browser.get.json.ftl
@@ -38,7 +38,7 @@
          "values": [
          	<#list p.values as val>
       		{
-      			"dataType": "${val.dataType}",
+      			"dataType": "${val.dataType!""}",
       			"value": <@printPropertyValue val />,
       			"isContent": ${val.content?string},
       			"isNodeRef": ${val.nodeRef?string},
@@ -47,8 +47,8 @@
          	</#list>
       	],
          "type": {
-         	"name": "${p.typeName.name}",
-         	"prefixedName": "${p.typeName.prefixedName}"
+         	"name": "<#if p.typeName??>${p.typeName.name}</#if>",
+         	"prefixedName": "<#if p.typeName??>${p.typeName.prefixedName}</#if>"
       	},
       	"multiple": ${p.collection?string},
          "residual": ${p.residual?string}
diff --git a/source/java/org/alfresco/slingshot/web/scripts/NodeBrowserScript.java b/source/java/org/alfresco/slingshot/web/scripts/NodeBrowserScript.java
index 8a555675fa..168905451d 100644
--- a/source/java/org/alfresco/slingshot/web/scripts/NodeBrowserScript.java
+++ b/source/java/org/alfresco/slingshot/web/scripts/NodeBrowserScript.java
@@ -991,7 +991,11 @@ public class NodeBrowserScript extends DeclarativeWebScript
              */
             public String getDataType()
             {
-                String datatype = Property.this.getTypeName().getName();
+                String datatype = null;
+                if (Property.this.getTypeName() != null)
+                {
+                    datatype = Property.this.getTypeName().getName();
+                }
                 if (datatype == null || datatype.equals(DataTypeDefinition.ANY.toString()))
                 {
                     if (value != null)