diff --git a/views_plugin_display_block.inc b/views_plugin_display_block.inc
index 275f5f4..f0c2aaf 100644
--- a/views_plugin_display_block.inc
+++ b/views_plugin_display_block.inc
@@ -190,25 +190,27 @@ 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') || db_table_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
    * exists in the blocks table. Dirty fix untill http://drupal.org/node/235673 gets in.
    */
   function save_block_cache($delta, $cache_setting) {
-    if ($bid = db_query("SELECT bid FROM {block} WHERE module = 'views' AND delta = :delta", array(
+    if ((module_exists('block') || db_table_exists('block')) && $bid = db_query("SELECT bid FROM {block} WHERE module = 'views' AND delta = :delta", array(
         ':delta' => $delta))->fetchField()) {
       db_update('block')
         ->fields(array(