diff --git a/data.views.inc b/data.views.inc
index 995f73a..fb522cf 100644
--- a/data.views.inc
+++ b/data.views.inc
@@ -141,7 +141,11 @@ function data_get_views_handler_options($type = NULL, $reset = FALSE) {
             $finished = FALSE;
             while (!$finished) {
               $current_handler = get_parent_class($current_handler);
-              if ($current_handler == 'views_handler') {
+              if ($current_handler == FALSE) {
+                $finished = TRUE;
+                // Should probably output some sort of warning here because the handler classes are broken somewhere
+              }
+              elseif ($current_handler == 'views_handler' || $current_handler == FALSE) {
                 // We've reached the top; don't add the root class to the list.
                 $finished = TRUE;
               }