diff --git a/Core/FieldType/SyliusProduct/SyliusProductStorage.php b/Core/FieldType/SyliusProduct/SyliusProductStorage.php
index <HASH>..<HASH> 100644
--- a/Core/FieldType/SyliusProduct/SyliusProductStorage.php
+++ b/Core/FieldType/SyliusProduct/SyliusProductStorage.php
@@ -215,7 +215,18 @@ class SyliusProductStorage extends GatewayBasedStorage
 
         $productId = $gateway->getFieldData( $versionInfo );
 
-        $product = $this->repository->find( $productId );
+        $product = null;
+        if( !empty( $productId ) )
+        {
+            $product = $this->repository->find( $productId );
+        }
+
+        if ( $product )
+        {
+            $product->setCurrentLocale(
+                $this->localeConverter->convertToPOSIX( $field->languageCode )
+            );
+        }
 
         $field->value->externalData = $product;
     }
Added sanity check and locale setting when loading field data