diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/solr/solr.lib.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/solr/solr.lib.ftl
index f8022a937d..77d229ef48 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/solr/solr.lib.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/solr/solr.lib.ftl
@@ -50,7 +50,7 @@
 <#macro nodeMetaDataJSON nodeMetaData filter>
       {
          "id": ${nodeMetaData.nodeId?c}
-         , "tenantDomain": "${nodeMetaData.tenantDomain}"
+         <#if nodeMetaData.tenantDomain??>, "tenantDomain": "${nodeMetaData.tenantDomain}"</#if>
          <#if filter.includeNodeRef??><#if nodeMetaData.nodeRef??>, "nodeRef": "${nodeMetaData.nodeRef.toString()}"</#if></#if>
          <#if filter.includeType??><#if nodeMetaData.nodeType??>, "type": <@qNameJSON qName=nodeMetaData.nodeType/></#if></#if>
          <#if filter.includeAclId??><#if nodeMetaData.aclId??>, "aclId": ${nodeMetaData.aclId?c}</#if></#if>
diff --git a/source/java/org/alfresco/repo/web/scripts/site/AllSiteTests.java b/source/java/org/alfresco/repo/web/scripts/site/AllSiteTests.java
index 6c8630f0ff..e2ea0d0eb7 100644
--- a/source/java/org/alfresco/repo/web/scripts/site/AllSiteTests.java
+++ b/source/java/org/alfresco/repo/web/scripts/site/AllSiteTests.java
@@ -19,6 +19,7 @@
 package org.alfresco.repo.web.scripts.site;
 
 import org.alfresco.repo.activities.SiteActivityTest;
+import org.alfresco.repo.site.SiteServiceImplMoreTest;
 import org.alfresco.repo.site.SiteServiceImplTest;
 import org.alfresco.service.cmr.site.SiteService;
 import org.junit.runner.RunWith;
@@ -35,6 +36,7 @@ import org.junit.runners.Suite;
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
     SiteServiceImplTest.class,
+    SiteServiceImplMoreTest.class,
     SiteServiceTest.class,
     SiteActivityTest.class
 })
diff --git a/source/java/org/alfresco/repo/web/scripts/solr/NodesMetaDataGet.java b/source/java/org/alfresco/repo/web/scripts/solr/NodesMetaDataGet.java
index 1f12375808..162a4006f9 100644
--- a/source/java/org/alfresco/repo/web/scripts/solr/NodesMetaDataGet.java
+++ b/source/java/org/alfresco/repo/web/scripts/solr/NodesMetaDataGet.java
@@ -264,6 +264,8 @@ public class NodesMetaDataGet extends DeclarativeWebScript
             // convert Paths to Strings
             List<String> paths = new ArrayList<String>();
             HashSet<String> ancestors = new HashSet<String>();
+            if(nodeMetaData.getPaths() != null)
+            {
             for(Pair<Path, QName> pair : nodeMetaData.getPaths())
             {
                 JSONObject o = new JSONObject();
@@ -276,6 +278,7 @@ public class NodesMetaDataGet extends DeclarativeWebScript
                     ancestors.add(ancestor.toString());
                 }
             }
+            }
             setAncestors(ancestors);
             setPaths(paths);