diff --git a/views_plugin_display_block.inc b/views_plugin_display_block.inc
index d5ff138..77d2376 100644
--- a/views_plugin_display_block.inc
+++ b/views_plugin_display_block.inc
@@ -12,10 +12,10 @@
 class views_plugin_display_block extends views_plugin_display {
   function option_definition() {
     $options = parent::option_definition();
-
+    
     $options['block_description'] = array('default' => '', 'translatable' => TRUE);
     $options['block_caching'] = array('default' => DRUPAL_NO_CACHE);
-
+    
     return $options;
   }
 
@@ -74,28 +74,30 @@ class views_plugin_display_block extends views_plugin_display {
       ),
     );
 
-    $block_description = strip_tags($this->get_option('block_description'));
-    if (empty($block_description)) {
-      $block_description = t('None');
-    }
+    if (module_exists('block')){ 
+      $block_description = strip_tags($this->get_option('block_description'));
+      if (empty($block_description)) {
+        $block_description = t('None');
+      }
 
-    $options['block_description'] = array(
-      'category' => 'block',
-      'title' => t('Block name'),
-      'value' => views_ui_truncate($block_description, 24),
-    );
+      $options['block_description'] = array(
+        'category' => 'block',
+        'title' => t('Block name'),
+        'value' => views_ui_truncate($block_description, 24),
+      );
 
-    $cache_type = $this->get_option('block_caching');
-    if (empty($cache_type)) {
-      $cache_type = DRUPAL_NO_CACHE;
-    }
+      $cache_type = $this->get_option('block_caching');
+      if (empty($cache_type)) {
+        $cache_type = DRUPAL_NO_CACHE;
+      }
 
-    $types = $this->block_caching_modes();
-    $options['block_caching'] = array(
-      'category' => 'other',
-      'title' => t('Block caching'),
-      'value' => $types[$this->get_cache_type()],
-    );
+      $types = $this->block_caching_modes();
+      $options['block_caching'] = array(
+        'category' => 'other',
+        'title' => t('Block caching'),
+        'value' => $types[$this->get_cache_type()],
+      );
+    }
   }
 
   /**
@@ -163,9 +165,7 @@ class views_plugin_display_block extends views_plugin_display {
     parent::options_submit($form, $form_state);
     switch ($form_state['section']) {
       case 'display_id':
-        if (module_exists('block')){
-          $this->update_block_bid($form_state['view']->name, $this->display->id, $this->display->new_id);
-        }
+        $this->update_block_bid($form_state['view']->name, $this->display->id, $this->display->new_id);
         break;
       case 'block_description':
         $this->set_option('block_description', $form_state['values']['block_description']);
@@ -192,18 +192,20 @@ class views_plugin_display_block extends views_plugin_display {
    * Update the block delta when you change the machine readable name of the display.
    */
   function update_block_bid($name, $old_delta, $delta) {
-    $old_delta = $name . '-' . $old_delta;
-    $delta = $name . '-' . $delta;
-    if (strlen($old_delta) >= 32) {
-      $old_delta = md5($old_delta);
-    }
-    if (strlen($delta) >= 32) {
-      $delta = md5($delta);
+    if (module_exists('block')){
+      $old_delta = $name . '-' . $old_delta;
+      $delta = $name . '-' . $delta;
+      if (strlen($old_delta) >= 32) {
+        $old_delta = md5($old_delta);
+      }
+      if (strlen($delta) >= 32) {
+        $delta = md5($delta);
+      }
+      db_update('block')
+        ->fields(array('delta' => $delta))
+        ->condition('delta', $old_delta)
+        ->execute();
     }
-    db_update('block')
-      ->fields(array('delta' => $delta))
-      ->condition('delta', $old_delta)
-      ->execute();
   }
   /**
    * Save the block cache setting in the blocks table if this block allready