diff --git a/src/ResourceType/ConfigurableResourceTypeRepository.php b/src/ResourceType/ConfigurableResourceTypeRepository.php
index e485fae..3c4eed6 100644
--- a/src/ResourceType/ConfigurableResourceTypeRepository.php
+++ b/src/ResourceType/ConfigurableResourceTypeRepository.php
@@ -154,12 +154,20 @@ class ConfigurableResourceTypeRepository extends ResourceTypeRepository {
   protected function getResourceConfig($resource_config_id) {
     try {
       $resource_configs = $this->getResourceConfigs();
-      return isset($resource_configs[$resource_config_id]) ?
-        $resource_configs[$resource_config_id] :
-        new NullJsonapiResourceConfig([], '');
+      if (isset($resource_configs[$resource_config_id])) {
+        return $resource_configs[$resource_config_id];
+      }
+
+      // Generate a NULL config object
+      $config = new NullJsonapiResourceConfig([], '');
+      $config->setOriginalId($resource_config_id);
+      return $config;
     }
     catch (PluginException $e) {
-      return new NullJsonapiResourceConfig([], '');
+      // Generate a NULL config object
+      $config = new NullJsonapiResourceConfig([], '');
+      $config->setOriginalId($resource_config_id);
+      return $config;
     }
   }
 
@@ -233,9 +241,6 @@ class ConfigurableResourceTypeRepository extends ResourceTypeRepository {
    * @throws \Drupal\Component\Plugin\Exception\PluginNotFoundException
    */
   protected function overrideFieldMapping(JsonapiResourceConfig $resource_config) {
-    if ($resource_config instanceof NullJsonapiResourceConfig) {
-      return [];
-    }
     // This is not ideal, but we cannot load the resource type to get the entity
     // type object. That is because this is used during the creation of the
     // ResourceType.