diff --git a/docroot/sites/all/modules/contrib/data/data.views.inc b/docroot/sites/all/modules/contrib/data/data.views.inc
index 995f73a..f4a01c3 100644
--- a/docroot/sites/all/modules/contrib/data/data.views.inc
+++ b/docroot/sites/all/modules/contrib/data/data.views.inc
@@ -140,17 +140,28 @@ function data_get_views_handler_options($type = NULL, $reset = FALSE) {
             // not actually used by any views data fields.
             $finished = FALSE;
             while (!$finished) {
-              $current_handler = get_parent_class($current_handler);
-              if ($current_handler == 'views_handler') {
-                // We've reached the top; don't add the root class to the list.
-                $finished = TRUE;
-              }
-              else {
-                // Add the class. This is going to be redundant in many cases
-                // as we'll have either already done this or be about to find
-                // it in the data, but this function is only called on an admin
-                // page so performance is not an issue.
-                $handlers[$handler_type][$current_handler] = $current_handler;
+              // Try to find the parent class name of the current handler.
+              $parent_handler = get_parent_class($current_handler);
+              switch($parent_handler) {
+                case FALSE:
+                  // Could not auto-load or find the parent handler in this scope.
+                  watchdog('data', 'Unable to detect class ancestry of Views handler %handler for %field_name.', array(
+                    '%handler' => $current_handler,
+                    '%field_name' => $table . '.' . $field,
+                  ));
+                  // Fall through to finish this branch.
+                case 'views_handler':
+                  // We've reached the root views_handler class or cannot continue up the tree.
+                  $finished = TRUE;
+                  break;
+                default:
+                  // Store the parent class and update current class so we can continue
+                  // up the tree. This is going to be redundant in many cases
+                  // as we'll have either already done this or be about to find
+                  // it in the data, but this function is only called on an admin
+                  // page so performance is not an issue.
+                  $handlers[$handler_type][$current_handler] = $current_handler = $parent_handler;
+                  break;
               }
             }
           }