Index: grails-app/services/com/lemans/ds/solr/SolrQueryService.groovy
===================================================================
diff -u -ra12b886a73efe5a5fed0cfe32443ebff58bfe795 -r9a653acc65d6d2cb2ee1d988eecc4de1f71187a7
--- grails-app/services/com/lemans/ds/solr/SolrQueryService.groovy	(.../SolrQueryService.groovy)	(revision a12b886a73efe5a5fed0cfe32443ebff58bfe795)
+++ grails-app/services/com/lemans/ds/solr/SolrQueryService.groovy	(.../SolrQueryService.groovy)	(revision 9a653acc65d6d2cb2ee1d988eecc4de1f71187a7)
@@ -694,8 +694,19 @@
         List<SimpleOrderedMap> buckets =  uniqueVals?.get('buckets')
 
         List values = populateCardinalityValuesForDate(buckets, missing, payload)
-        Optional<Map<String, Object>> optionalResult = values?.stream()
-                ?.max{ obj1, obj2 -> obj1.date.compareTo(obj2.date) }.orElse(null)
+        println values
+        Optional<Map<String, Object>> optionalResult = values.stream()
+                .max{ obj1, obj2 ->
+            if (obj1.date == null && obj2.date == null) {
+                return 0
+            } else if (obj1.date == null) {
+                return 1
+            } else if (obj2.date == null) {
+                return -1
+            } else {
+                return obj1.date.compareTo(obj2.date)
+            }
+        }.orElse(null)
         Date totalDate = optionalResult.isPresent() ? optionalResult.get()['date'] : null
         [type: payload.queueType.name(), displayName: payload.queueType.value, drillDowns: values ?: [], date: totalDate]
     }