diff --git a/src/GeoclusterConfig.php b/src/GeoclusterConfig.php
index a0d31fd..a44e382 100644
--- a/src/GeoclusterConfig.php
+++ b/src/GeoclusterConfig.php
@@ -200,10 +200,12 @@ class GeoclusterConfig implements GeoclusterConfigBackendInterface {
         $field_storage_definitions = \Drupal::service('entity_field.manager')->getFieldStorageDefinitions($handler->getEntityType());
         $field_storage_definition = $field_storage_definitions[$handler->definition['field_name']];
 
-        $type = $field_storage_definition->getType();
-        $definition = \Drupal::service('plugin.manager.field.field_type')->getDefinition($type);
-        if (is_a($definition['class'], '\Drupal\geofield\Plugin\Field\FieldType\GeofieldItem', TRUE)) {
-          $cluster_field_options[$field_id] = $label;
+        if ($field_storage_definition && method_exists($field_storage_definition, 'getType')) {
+          $type = $field_storage_definition->getType();
+          $definition = \Drupal::service('plugin.manager.field.field_type')->getDefinition($type);
+          if (is_a($definition['class'], '\Drupal\geofield\Plugin\Field\FieldType\GeofieldItem', TRUE)) {
+            $cluster_field_options[$field_id] = $label;
+          }
         }
       }
     }