diff --git a/repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrJSONResultSet.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrJSONResultSet.java
index 3c9348e9c4..ecb48adb40 100644
--- a/repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrJSONResultSet.java
+++ b/repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrJSONResultSet.java
@@ -267,13 +267,14 @@ public class SolrJSONResultSet implements SearchEngineResultSet {
                         ArrayList<Pair<String, Integer>> facetValues = new ArrayList<Pair<String, Integer>>(facetArraySize/2);
                         for(int i = 0; i < facetArraySize; i+=2)
                         {
+                            String facetEntryName = "Null";
                             if(!facets.isNull(i))
                             {
-                                String facetEntryName = facets.getString(i);
-                                Integer facetEntryCount = Integer.valueOf(facets.getInt(i + 1));
-                                Pair<String, Integer> pair = new Pair<String, Integer>(facetEntryName, facetEntryCount);
-                                facetValues.add(pair);
+                                facetEntryName = facets.getString(i);
                             }
+                            Integer facetEntryCount = Integer.valueOf(facets.getInt(i + 1));
+                            Pair<String, Integer> pair = new Pair<String, Integer>(facetEntryName, facetEntryCount);
+                            facetValues.add(pair);
                         }
                         fieldFacets.put(fieldName, facetValues);
                     }