diff --git a/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php b/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php
index 9e40c81..9c02ec4 100644
--- a/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php
+++ b/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php
@@ -149,14 +149,14 @@ public function blockSubmit($form, FormStateInterface $form_state) {
    */
   public function build() {
     $uuid = $this->getDerivativeId();
-    if ($block = entity_load_by_uuid('block_content', $uuid)) {
-      return entity_view($block, $this->configuration['view_mode']);
+    if ($block = \Drupal::entityManager()->loadEntityByUuid('block_content', $uuid)) {
+      return \Drupal::entityManager()->getViewBuilder($block)->view($block, $this->configuration['view_mode']);
     }
     else {
       return array(
         '#markup' => t('Block with uuid %uuid does not exist. <a href="!url">Add custom block</a>.', array(
           '%uuid' => $uuid,
-          '!url' => url('block/add')
+          '!url' => \Drupal::urlGenerator()->generate('block_content.add_page'),
         )),
         '#access' => $this->account->hasPermission('administer blocks')
       );