diff --git a/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php b/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php
index 0ad4ca4..342d0cc 100644
--- a/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php
+++ b/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php
@@ -154,8 +154,9 @@ public function build() {
     }
     else {
       return array(
-        '#markup' => t('Block with uuid %uuid does not exist.', array(
+        '#markup' => t('Block with uuid %uuid does not exist. <a href="!url">Add custom block</a>.', array(
           '%uuid' => $uuid,
+          '!url' => url('block/add')
         )),
         '#access' => $this->account->hasPermission('administer blocks')
       );
diff --git a/core/modules/block_content/src/Tests/BlockContentPageViewTest.php b/core/modules/block_content/src/Tests/BlockContentPageViewTest.php
index ed9eee7..9d57528 100644
--- a/core/modules/block_content/src/Tests/BlockContentPageViewTest.php
+++ b/core/modules/block_content/src/Tests/BlockContentPageViewTest.php
@@ -22,7 +22,7 @@ class BlockContentPageViewTest extends BlockContentTestBase {
   public static $modules = array('block', 'block_content', 'block_content_test');
 
   /**
-   * Checks block edit and fallback functionality.
+   * Checks block edit functionality.
    */
   public function testPageEdit() {
     $this->drupalLogin($this->adminUser);
@@ -33,15 +33,6 @@ public function testPageEdit() {
 
     // Assert response was '200' and not '403 Access denied'.
     $this->assertResponse('200', 'User was able the view the block');
-
-    $this->drupalGet('<front>');
-    $expected_text = t('Block with uuid %uuid does not exist.', array(
-      '%uuid' => 'foobar_gorilla',
-    ));
-    $this->assertRaw($expected_text);
-
-    $this->drupalLogout();
-    $this->assertNoRaw($expected_text);
- }
+  }
 
 }
diff --git a/core/modules/block_content/tests/modules/block_content_test/config/install/block.block.foobar.yml b/core/modules/block_content/tests/modules/block_content_test/config/install/block.block.foobar.yml
deleted file mode 100644
index 939779c..0000000
--- a/core/modules/block_content/tests/modules/block_content_test/config/install/block.block.foobar.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-id: foobar
-weight: null
-status: true
-langcode: en
-dependencies:
-  module:
-    - custom_block
-  theme:
-    - stark
-theme: stark
-region: sidebar_first
-plugin: 'custom_block:foobar_gorilla'
-settings:
-  label: Foobar
-  provider: custom_block
-  label_display: visible
-  cache:
-    max_age: -1
-    contexts: {  }
-  status: true
-  info: ''
-  view_mode: default
-  admin_label: ''
-  custom_block:
-    view_mode: default
-visibility:
-  path:
-    visibility: 0
-    pages: ''
-  role:
-    roles: {  }
-  node_type:
-    types:
-      article: '0'
-      page: '0'