diff --git a/core/modules/block/block.module b/core/modules/block/block.module
index 31ef8db..6466b60 100644
--- a/core/modules/block/block.module
+++ b/core/modules/block/block.module
@@ -5,6 +5,8 @@
  * Controls the visual building blocks a page is constructed with.
  */
 
+use Drupal\Component\Plugin\Exception\PluginException;
+
 /**
  * Denotes that a block is not enabled in any region and should not be shown.
  */
@@ -361,7 +363,10 @@ function _block_rehash($theme = NULL) {
   $block_configs = config_get_storage_names_with_prefix('plugin.core.block.' . $theme);
   $regions = system_region_list($theme);
   foreach ($block_configs as $config) {
-    $blocks[$config] = block_load($config);
+    if (!$block = block_load($config)) {
+      continue;
+    }
+    $blocks[$config] = $block;
     $config = config($config);
     $region = $config->get('region');
     $status = $config->get('status');
@@ -476,7 +481,16 @@ function block_list($region) {
 function block_load($plugin_id, array $conf = array()) {
   $manager = drupal_container()->get('plugin.manager.block');
   if (!$block = $manager->getInstance(array('config' => $plugin_id))) {
-    $block = $manager->createInstance($plugin_id, $conf);
+    try {
+      $block = $manager->createInstance($plugin_id, $conf);
+    }
+    catch (PluginException $e) {
+      $config = config($plugin_id)->get();
+      if (module_exists($config['module'])) {
+        throw $e;
+      }
+      return FALSE;
+    }
   }
   return $block;
 }
@@ -493,9 +507,16 @@ function _block_load_blocks() {
   $instances = config_get_storage_names_with_prefix('plugin.core.block.' . $theme);
   $manager = drupal_container()->get('plugin.manager.block');
   foreach ($instances as $plugin_id) {
-    $block = $manager->getInstance(array('config' => $plugin_id));
-    $config = $block->getConfig();
-    $blocks[$config['region']]["$plugin_id"] = $block;
+    if ($block = $manager->getInstance(array('config' => $plugin_id))) {
+      $config = $block->getConfig();
+      $blocks[$config['region']]["$plugin_id"] = $block;
+    }
+    else {
+      $config = config($plugin_id)->get();
+      if (module_exists($config['module'])) {
+        throw new PluginException(sprintf('The plugin %s was not found.', $plugin_id));
+      }
+    }
   }
   return $blocks;
 }
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockTest.php b/core/modules/block/lib/Drupal/block/Tests/BlockTest.php
index 6a3dd0c..74ee31f 100644
--- a/core/modules/block/lib/Drupal/block/Tests/BlockTest.php
+++ b/core/modules/block/lib/Drupal/block/Tests/BlockTest.php
@@ -379,4 +379,31 @@ function testBlockRehash() {
     $config = $instance->getConfig();
     $this->assertEqual($config['cache'], DRUPAL_NO_CACHE, "Test block's database entry updated to DRUPAL_NO_CACHE.");
   }
+
+  /**
+   * Test disabled blocks.
+   */
+  function testBlockModuleDisable() {
+    module_enable(array('block_test'));
+    $this->assertTrue(module_exists('block_test'), 'Test block module enabled.');
+
+    // Clear the block cache to load the block_test module's block definitions.
+    $manager = $this->container->get('plugin.manager.block');
+    $manager->clearCachedDefinitions();
+
+    // Add a test block.
+    $plugin = $manager->getDefinition('test_cache');
+    $block = array();
+    $block['id'] = 'test_cache';
+    $block['machine_name'] = $this->randomName(8);
+    $block['theme'] = variable_get('theme_default', 'stark');
+    $block['region'] = 'header';
+    $this->drupalPost('admin/structure/block/manage/' . $block['id'] . '/' . $block['theme'], array('machine_name' => $block['machine_name'], 'region' => $block['region']), t('Save block'));
+
+    module_disable(array('block_test'), FALSE);
+    $this->drupalGet('admin/structure/block');
+    $this->assertResponse(200);
+    $this->assertTitle(t('Blocks | Drupal'));
+  }
+
 }