diff --git a/core/modules/responsive_image/responsive_image.module b/core/modules/responsive_image/responsive_image.module
index 0c93cb9..6c551c5 100644
--- a/core/modules/responsive_image/responsive_image.module
+++ b/core/modules/responsive_image/responsive_image.module
@@ -322,8 +322,9 @@ function responsive_image_get_image_dimensions($variables) {
       'height' => 1,
     );
   }
-  else {
-    entity_load('image_style', $variables['style_name'])->transformDimensions($dimensions);
+  elseif ($entity = entity_load('image_style', $variables['style_name'])
+      and $entity instanceof Drupal\image\Entity\ImageStyle) {
+    $entity->transformDimensions($dimensions);
   }
 
   return $dimensions;
@@ -337,6 +338,10 @@ function _responsive_image_image_style_url($style_name, $path) {
     // The smallest data URI for a 1px square transparent GIF image.
     return 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7';
   }
-  return entity_load('image_style', $style_name)->buildUrl($path);
+  if ($entity = entity_load('image_style', $style_name)
+      and $entity instanceof Drupal\image\Entity\ImageStyle) {
+    return $entity->buildUrl($path);
+  }
+  return file_create_url($path);
 }
 
