diff --git a/server/routes/images.js b/server/routes/images.js
index ae2c88c22..138baec30 100644
--- a/server/routes/images.js
+++ b/server/routes/images.js
@@ -59,7 +59,11 @@ router.post('/images/upload', multer({limits: {fileSize: 10 * 1024 * 1024}}).any
     const ids = [];
     for (let file of req.files) {
         const id = ulid();
-        const image = await loadImage(await sharp(file.buffer).png().toBuffer());
+        try {
+            const image = await loadImage(await sharp(file.buffer).png().toBuffer());
+        } catch {
+            return res.status(400).json({error: 'File type not supported'});
+        }
 
         for (let s in sizes) {
             if (!sizes.hasOwnProperty(s)) { continue; }
diff --git a/src/error.js b/src/error.js
index 6fabc5449..9ff0f2992 100644
--- a/src/error.js
+++ b/src/error.js
@@ -1,3 +1,3 @@
 module.exports = (err, req) => {
-    return `[${new Date().toISOString()}][${req ? (req.method + ' ' + req.url) : ''}] ${err.message || err} ${err.stack}`;
+    return `[${new Date().toISOString()}] [${req ? (req.method + ' ' + req.url) : ''}] ${err.message || err} ${err.stack}`;
 }