diff --git a/modules/graphql_core/src/Plugin/Deriver/Fields/EntityFieldDeriver.php b/modules/graphql_core/src/Plugin/Deriver/Fields/EntityFieldDeriver.php
index def5716..ea5e931 100644
--- a/modules/graphql_core/src/Plugin/Deriver/Fields/EntityFieldDeriver.php
+++ b/modules/graphql_core/src/Plugin/Deriver/Fields/EntityFieldDeriver.php
@@ -29,6 +29,10 @@ class EntityFieldDeriver extends EntityFieldDeriverWithTypeMapping {
       return [];
     }

+    if ($fieldDefinition->getType() === 'map') {
+      return [];
+    }
+
     $derivative = [
       'parents' => $parents,
       'name' => EntityField::getId($fieldName),
diff --git a/modules/graphql_core/src/Plugin/Deriver/Types/EntityFieldTypeDeriver.php b/modules/graphql_core/src/Plugin/Deriver/Types/EntityFieldTypeDeriver.php
index 01a80e5..b518cc4 100644
--- a/modules/graphql_core/src/Plugin/Deriver/Types/EntityFieldTypeDeriver.php
+++ b/modules/graphql_core/src/Plugin/Deriver/Types/EntityFieldTypeDeriver.php
@@ -19,6 +19,10 @@ class EntityFieldTypeDeriver extends EntityFieldDeriverBase {
       return [];
     }

+    if ($fieldDefinition->getType() === 'map') {
+      return [];
+    }
+
     $fieldName = $fieldDefinition->getName();

     return ["$entityTypeId-$fieldName" => [
diff --git a/src/Plugin/GraphQL/PluggableSchemaBuilder.php b/src/Plugin/GraphQL/PluggableSchemaBuilder.php
index 9563b94..bc40070 100644
--- a/src/Plugin/GraphQL/PluggableSchemaBuilder.php
+++ b/src/Plugin/GraphQL/PluggableSchemaBuilder.php
@@ -119,7 +119,7 @@ class PluggableSchemaBuilder implements PluggableSchemaBuilderInterface {
     }, $types);

     if (empty($result)) {
-      throw new InvalidPluginDefinitionException(sprintf('GraphQL plugin with name %s could not be found.', $name));
+      throw new InvalidPluginDefinitionException($name, sprintf('GraphQL plugin with name %s could not be found.', $name));
     }

     return array_pop($result);