diff --git a/boxes.module b/boxes.module
index 1bc1336..17a84cf 100644
--- a/boxes.module
+++ b/boxes.module
@@ -377,8 +377,10 @@ function boxes_box_load($delta = NULL) {
   $boxes = array();
   foreach (ctools_export_load_object('box') as $box) {
     $box = boxes_box::load($box->delta);
-    drupal_alter('boxes_box_load', $box, $delta);
-    $boxes[$box->delta] = $box;
+    if($box) {
+      drupal_alter('boxes_box_load', $box, $delta);
+      $boxes[$box->delta] = $box;
+    }
   }
   return $boxes;
 }
diff --git a/plugins/boxes_box.inc b/plugins/boxes_box.inc
index 71c6839..224f07f 100644
--- a/plugins/boxes_box.inc
+++ b/plugins/boxes_box.inc
@@ -28,7 +28,7 @@ abstract class boxes_box {
         self::$boxes[$delta]->new = FALSE;
       }
     }
-    return isset(self::$boxes[$delta]) ? self::$boxes[$delta] : NULL;
+    return isset(self::$boxes[$delta]) && get_class(self::$boxes[$delta]) != 'stdClass' ? self::$boxes[$delta] : NULL;
   }
 
   /**