diff --git a/src/General/html/Build/File.html b/src/General/html/Build/File.html
index 88cf2f86c..d48f11db2 100644
--- a/src/General/html/Build/File.html
+++ b/src/General/html/Build/File.html
@@ -4,7 +4,7 @@
     <div class="fileInfo"><span class="fileText" id="fT${postID}">
       File: 
       <a data-width="${file.width}" data-height="${file.height}" href="${fileURL}" target="_blank">${file.name}</a>
-      -(${file.size}, ${file.dimensions}, ${file.tag})
+      -(${file.size}, ${file.dimensions}?{file.tag}{, ${file.tag}})
     </span></div>
   }{
     <div class="fileText" id="fT${postID}"?{file.isSpoiler}{ title="${file.name}"}>
diff --git a/src/General/lib/fetcher.class b/src/General/lib/fetcher.class
index 890bfaf28..5a143799d 100644
--- a/src/General/lib/fetcher.class
+++ b/src/General/lib/fetcher.class
@@ -160,7 +160,7 @@ class Fetcher
         twidth:    data.media.preview_w
         isSpoiler: data.media.spoiler is '1'
       o.file.dimensions = "#{o.file.width}x#{o.file.height}" unless /\.pdf$/.test o.file.url
-      o.file.tag = JSON.parse(data.media.exif).Tag if @boardID is 'f'
+      o.file.tag = JSON.parse(data.media.exif).Tag if @boardID is 'f' and data.media.exif
 
     board = g.boards[@boardID] or
       new Board @boardID