diff --git a/core/lib/Drupal/Core/Entity/EntityManager.php b/core/lib/Drupal/Core/Entity/EntityManager.php
index 2990975..f9ec78b 100644
--- a/core/lib/Drupal/Core/Entity/EntityManager.php
+++ b/core/lib/Drupal/Core/Entity/EntityManager.php
@@ -349,8 +349,8 @@ protected function buildBaseFieldDefinitions($entity_type_id) {
     $class = $entity_type->getClass();
 
     // Fail with an exception for config entity types.
-    if (in_array('Drupal\Core\Config\Entity\ConfigEntityInterface', class_implements($class))) {
-      throw new \LogicException(String::format('Getting the base fields is not supported for config entity type @type.', array('@type' => $entity_type->getLabel())));
+    if (!in_array('Drupal\Core\TypedData\ComplexDataInterface', class_implements($class))) {
+      throw new \LogicException(String::format('Getting the base fields is not supported for entity type @type.', array('@type' => $entity_type->getLabel())));
     }
 
     // Retrieve base field definitions and assign them the entity type provider.