diff --git a/includes/common.inc b/includes/common.inc
index 7e7c837..b8917dd 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -7653,7 +7653,7 @@ function entity_get_controller($entity_type) {
   if (!isset($controllers[$entity_type])) {
     $type_info = entity_get_info($entity_type);
     $class = $type_info['controller class'];
-    $controllers[$entity_type] = new $class($entity_type);
+    $controllers[$entity_type] = empty($class) ? new DrupalDefaultEntityController($entity_type) : new $class($entity_type);
   }
   return $controllers[$entity_type];
 }