diff --git a/src/Service/UwNodeFieldValue.php b/src/Service/UwNodeFieldValue.php
index 8a03b256acd3db4788686489bfd34cd82f438190..8ba29e7e1fd11dee5c2da49bfdf8674c141bfb59 100644
--- a/src/Service/UwNodeFieldValue.php
+++ b/src/Service/UwNodeFieldValue.php
@@ -356,7 +356,7 @@ class UwNodeFieldValue {
     }
 
     // If there is a type for the image, add it to the array.
-    if (isset($extra_options['type'])) {
+    if (!empty($image) && isset($extra_options['type'])) {
       $image['type'] = $extra_options['type'];
     }
 
@@ -640,6 +640,7 @@ class UwNodeFieldValue {
     $return_sources = [];
 
     if ($node->$field_name) {
+
       // Get the image entity.
       $image = $node->$field_name->entity;
 
@@ -648,7 +649,7 @@ class UwNodeFieldValue {
         $sources = $this->uwService->prepareResponsiveImage($image, 'uw_ris_media');
       }
       else {
-        $sources = NULL;
+        return [];
       }
 
       if (isset($sources['responsive_sources'])) {