diff --git a/boxes.module b/boxes.module
index 70c66fa..75df9e3 100644
--- a/boxes.module
+++ b/boxes.module
@@ -179,44 +179,45 @@ function boxes_block_view($delta) {
   elseif ($box = boxes_box_load($delta)) {
     // Generate content and provide an editing form if user has proper
     // permissions.
-    $block = $box->render();
-    if (boxes_access_edit()) {
-      if (variable_get('boxes_edit_location', BOXES_EDIT_IN_PLACE) == BOXES_EDIT_IN_PLACE) {
-        $edit_link = array(
-          'title' => t('Edit Box'),
-          'href' => $_GET['q'],
-          'query' => array(
-            'plugin_key' => '',
-            'boxes_delta' => $block['delta'],
+    if ($block = $box->render()) {
+      if (boxes_access_edit()) {
+        if (variable_get('boxes_edit_location', BOXES_EDIT_IN_PLACE) == BOXES_EDIT_IN_PLACE) {
+          $edit_link = array(
+            'title' => t('Edit Box'),
+            'href' => $_GET['q'],
+            'query' => array(
+              'plugin_key' => '',
+              'boxes_delta' => $block['delta'],
+            ),
+            'attributes' => array('class' => array('use-ajax')),
+          );
+        }
+        else {
+          $edit_link = array(
+            'title' => t('Edit Box'),
+            'href' => 'admin/structure/block/manage/boxes/' . $block['delta'] . '/configure',
+            'query' => drupal_get_destination(),
+          );
+
+        }
+        $block['controls'] = theme('links', array(
+          'links' => array(
+            'edit' => $edit_link,
+            'cancel' => array(
+              'title' => t('Cancel'),
+              'href' => $_GET['q'],
+            ),
           ),
-          'attributes' => array('class' => array('use-ajax')),
-        );
+        ));
       }
-      else {
-        $edit_link = array(
-          'title' => t('Edit Box'),
-          'href' => 'admin/structure/block/manage/boxes/' . $block['delta'] . '/configure',
-          'query' => drupal_get_destination(),
-        );
-
+      // Add additional_classes
+      if (!empty($box->options['additional_classes'])) {
+        $block['additional_classes'] = $box->options['additional_classes'];
       }
-      $block['controls'] = theme('links', array(
-        'links' => array(
-          'edit' => $edit_link,
-          'cancel' => array(
-            'title' => t('Cancel'),
-            'href' => $_GET['q'],
-          ),
-        ),
-      ));
-    }
-    // Add additional_classes
-    if (!empty($box->options['additional_classes'])) {
-      $block['additional_classes'] = $box->options['additional_classes'];
+      $block['content'] = theme('boxes_box', array('block' => $block));
+      $block['boxes_plugin'] = $box->plugin_key;
+      return $block;
     }
-    $block['content'] = theme('boxes_box', array('block' => $block));
-    $block['boxes_plugin'] = $box->plugin_key;
-    return $block;
   }
 }
 
@@ -480,7 +481,7 @@ function boxes_box_form_submit($form, $form_state) {
   $box->options['additional_classes'] = $form_state['values']['additional_classes'];
   $box->options['additional_classes'] = isset($form_state['values']['additional_classes']) ?
     $form_state['values']['additional_classes'] : array();
-    
+
   if (module_exists('spaces') && $space = spaces_get_space()) {
     $space->controllers->boxes->set($box->delta, $box);
   }