diff --git a/date_facets.module b/date_facets.module
index 2a4e021..b8d74b5 100644
--- a/date_facets.module
+++ b/date_facets.module
@@ -62,7 +62,9 @@ function date_facets_associate_widget(array &$facet_info) {
 function _date_facets_api_facet_create_label(array $values, array $options) {
   $map = array();
 
-  $ranges = date_facets_get_ranges($options['field']['key'], $options['index id']);
+  if (isset($options['index id']) && isset($options['field']) && isset($options['field']['key'])) {
+    $ranges = date_facets_get_ranges($options['field']['key'], $options['index id']);
+  }
 
   // Default ranges.
   if (empty($ranges)) {
@@ -72,7 +74,9 @@ function _date_facets_api_facet_create_label(array $values, array $options) {
   // Loop through all the values to create a map.
   // Pull the correct display value from the range definitions.
   foreach ($values as $key => $value) {
-    $map[$value] = $ranges[$value]['#markup'];
+    if (isset($ranges[$value]['#markup'])) {
+      $map[$value] = $ranges[$value]['#markup'];
+    }
   }
 
   return $map;
diff --git a/lib/Drupal/Apachesolr/Facetapi/QueryType/DateRangeQueryType.php b/lib/Drupal/Apachesolr/Facetapi/QueryType/DateRangeQueryType.php
index 41c27b3..5e7219d 100644
--- a/lib/Drupal/Apachesolr/Facetapi/QueryType/DateRangeQueryType.php
+++ b/lib/Drupal/Apachesolr/Facetapi/QueryType/DateRangeQueryType.php
@@ -97,7 +97,7 @@ class Drupal_Apachesolr_Facetapi_QueryType_DateRangeQueryType extends FacetapiQu
     $settings = $this->adapter->getFacetSettings($this->facet, facetapi_realm_load('block'));
     $ranges = (isset($settings->settings['ranges']) && !empty($settings->settings['ranges']) ? $settings->settings['ranges'] : date_facets_default_ranges());
     // Build the markup for the date ranges.
-    $build = date_facets_get_ranges($ranges);
+    $build = date_facets_get_ranges($ranges,NULL);
 
     if ($response = apachesolr_static_response_cache($this->adapter->getSearcher())) {
       $facet_global_settings = $this->adapter->getFacet($this->facet)->getSettings();