diff --git a/wagtail/wagtailimages/rich_text.py b/wagtail/wagtailimages/rich_text.py index 9caaed3bd..17d0fcfbf 100644 --- a/wagtail/wagtailimages/rich_text.py +++ b/wagtail/wagtailimages/rich_text.py @@ -31,15 +31,12 @@ class ImageEmbedHandler(object): Image = get_image_model() try: image = Image.objects.get(id=attrs['id']) - format = get_image_format(attrs['format']) - - if for_editor: - try: - return format.image_to_editor_html(image, attrs['alt']) - except: - return '' - else: - return format.image_to_html(image, attrs['alt']) - except Image.DoesNotExist: return "" + + format = get_image_format(attrs['format']) + + if for_editor: + return format.image_to_editor_html(image, attrs['alt']) + else: + return format.image_to_html(image, attrs['alt'])