diff --git a/lib/Drupal/configuration/Config/EntityApiConfiguration.php b/lib/Drupal/configuration/Config/EntityApiConfiguration.php
index efead33..fe76a51 100644
--- a/lib/Drupal/configuration/Config/EntityApiConfiguration.php
+++ b/lib/Drupal/configuration/Config/EntityApiConfiguration.php
@@ -143,7 +143,14 @@ class EntityApiConfiguration extends Configuration {
    */
   public function prepareBuild() {
     $entity_type = $this->getComponent();
-    $this->data = entity_load_single($entity_type, $this->getIdentifier());
+    $entity = entity_load_single($entity_type, $this->getIdentifier());
+
+    if (empty($entity)) {
+      $this->data = NULL;
+      return $this;
+    }
+
+    $this->data = $entity;
     return $this;
   }