Merge pull request #1773 from torchbox/revert-1768-feature/improve_exception_handling

Revert "Use model specific "DoesNotExist" exception "

wagtail/wagtailimages/models.py

@@ -10,7 +10,7 @@ from taggit.managers import TaggableManager
 from willow.image import Image as WillowImage
 
 from django.core.files import File
-from django.core.exceptions import ImproperlyConfigured
+from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist
 from django.db import models
 from django.db.models.signals import pre_delete, pre_save
 from django.dispatch.dispatcher import receiver
@@ -223,7 +223,7 @@ class AbstractImage(models.Model, TagSearchable):
                 filter=filter,
                 focal_point_key=cache_key,
             )
-        except Rendition.DoesNotExist:
+        except ObjectDoesNotExist:
             # Generate the rendition image
             generated_image, output_format = filter.run(self, BytesIO())