0
@@ -91,6 +91,10 @@ module Fleximage
0
           end
0
         end
0
         
0
+        def self.has_store?
0
+          db_store? || image_directory
0
+        end
0
+        
0
         # validation callback
0
         validate :validate_image
0
         
0
@@ -327,14 +331,18 @@ module Fleximage
0
         return @output_image if @output_image
0
         
0
         # Load the image from disk
0
-        if self.class.db_store?
0
-          if image_file_data && image_file_data.any?
0
-            @output_image = Magick::Image.from_blob(image_file_data).first
0
+        if self.class.has_store?
0
+          if self.class.db_store?
0
+            if image_file_data && image_file_data.any?
0
+              @output_image = Magick::Image.from_blob(image_file_data).first
0
+            else
0
+              master_image_not_found
0
+            end
0
           else
0
-            master_image_not_found
0
+            @output_image = Magick::Image.read(file_path).first
0
           end
0
         else
0
-          @output_image = Magick::Image.read(file_path).first
0
+          master_image_not_found
0
         end
0
         
0
       rescue Magick::ImageMagickError => e