diff --git a/taiga/base/utils/thumbnails.py b/taiga/base/utils/thumbnails.py
index e6d6a4b0..6d502142 100644
--- a/taiga/base/utils/thumbnails.py
+++ b/taiga/base/utils/thumbnails.py
@@ -68,7 +68,7 @@ def psd_image_factory(data, *args):
 Image.register_open("PSD", psd_image_factory)
 
 
-def get_thumbnail_url(file_obj, thumbnailer_size):
+def get_thumbnail(file_obj, thumbnailer_size):
     # Ugly hack to temporary ignore tiff files
     relative_name = file_obj
     if isinstance(file_obj, FieldFile):
@@ -79,9 +79,18 @@ def get_thumbnail_url(file_obj, thumbnailer_size):
         return None
 
     try:
-        path_url = get_thumbnailer(file_obj)[thumbnailer_size].url
-        thumb_url = get_absolute_url(path_url)
+        thumbnailer = get_thumbnailer(file_obj)
+        return thumbnailer[thumbnailer_size]
     except InvalidImageFormatError:
-        thumb_url = None
+        return None
 
+
+def get_thumbnail_url(file_obj, thumbnailer_size):
+    thumbnail = get_thumbnail(file_obj, thumbnailer_size)
+
+    if not thumbnail:
+        return None
+
+    path_url = thumbnail.url
+    thumb_url = get_absolute_url(path_url)
     return thumb_url