diff --git a/modules/entity_share_client/src/Plugin/EntityShareClient/Processor/EntityReference.php b/modules/entity_share_client/src/Plugin/EntityShareClient/Processor/EntityReference.php
index 49966ca..7cfb757 100644
--- a/modules/entity_share_client/src/Plugin/EntityShareClient/Processor/EntityReference.php
+++ b/modules/entity_share_client/src/Plugin/EntityShareClient/Processor/EntityReference.php
@@ -8,6 +8,7 @@ use Drupal\Component\Serialization\Json;
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\PluginFormInterface;
+use Drupal\Core\Session\AccountProxyInterface;
 use Drupal\entity_share\EntityShareUtility;
 use Drupal\entity_share_client\Event\RelationshipFieldValueEvent;
 use Drupal\entity_share_client\ImportProcessor\ImportProcessorPluginBase;
@@ -72,6 +73,13 @@ class EntityReference extends ImportProcessorPluginBase implements PluginFormInt
    */
   protected $currentRecursionDepth = 0;
 
+  /**
+   * The current user.
+   *
+   * @var \Drupal\Core\Session\AccountProxyInterface
+   */
+  protected $currentUser;
+
   /**
    * {@inheritdoc}
    */
@@ -82,6 +90,7 @@ class EntityReference extends ImportProcessorPluginBase implements PluginFormInt
     $instance->remoteManager = $container->get('entity_share_client.remote_manager');
     $instance->logger = $container->get('logger.channel.entity_share_client');
     $instance->entityReferenceHelper = $container->get('entity_share_client.entity_reference_helper');
+    $instance->currentUser = $container->get('current_user');
     return $instance;
   }
 
@@ -124,9 +133,7 @@ class EntityReference extends ImportProcessorPluginBase implements PluginFormInt
         }
         $field = $processed_entity->get($field_internal_name);
 
-        if ($this->entityReferenceHelper->relationshipHandleable($field) !== EntityReferenceHelperInterface::RELATIONSHIP_HANDLEABLE) {
-          continue;
-        }
+        $relationship_handleable = $this->entityReferenceHelper->relationshipHandleable($field);
 
         $main_property = $field->getItemDefinition()->getMainPropertyName();
         $field_values = [];
@@ -137,7 +144,8 @@ class EntityReference extends ImportProcessorPluginBase implements PluginFormInt
           $referenced_entities_ids = [];
 
           // Max recursion depth reached. Reference only existing entities.
-          if ($this->currentRecursionDepth == $this->configuration['max_recursion_depth']) {
+          // Also don't pull users or config entities.
+          if ($this->currentRecursionDepth == $this->configuration['max_recursion_depth'] || $relationship_handleable != EntityReferenceHelperInterface::RELATIONSHIP_HANDLEABLE) {
             $referenced_entities_ids = $this->getExistingEntities($prepared_field_data);
           }
           // Import referenced entities.
@@ -173,7 +181,19 @@ class EntityReference extends ImportProcessorPluginBase implements PluginFormInt
             $field_values[] = $event->getFieldValue();
           }
         }
-        $processed_entity->set($field_public_name, $field_values);
+        // Most fields occur under their public name, but
+        // some fields use the internal name.
+        if ($processed_entity->hasField($field_public_name)) {
+          $field_name = $field_public_name;
+        }
+        else if ($processed_entity->hasField($field_internal_name)) {
+          // Just to be sure that one of the field names is used and
+          // the field exists.
+          $field_name = $field_internal_name;
+        }
+        if (!empty($field_values) || (empty($field_values) && !$processed_entity->getFieldDefinition($field_public_name)->isRequired())) {
+          $processed_entity->set($field_name, $field_values);
+        }
       }
 
       // @todo Test if this is still needed.
