diff --git a/server/server.js b/server/server.js
index d3c10203..e6903d8c 100644
--- a/server/server.js
+++ b/server/server.js
@@ -117,7 +117,7 @@ app.get('/download/:id', (req, res) => {
   }
 
   storage.filename(id).then(filename => {
-    storage
+    return storage
       .length(id)
       .then(contentLength => {
         storage.ttl(id).then(timeToExpiry => {
@@ -128,11 +128,11 @@ app.get('/download/:id', (req, res) => {
             timeToExpiry: timeToExpiry
           });
         });
-      })
-      .catch(() => {
-        res.status(404).render('notfound');
       });
-  });
+  })
+  .catch(() => {
+    res.status(404).render('notfound');
+  });;
 });
 
 app.get('/assets/download/:id', (req, res) => {
diff --git a/server/storage.js b/server/storage.js
index 66a1a192..3fc1af84 100644
--- a/server/storage.js
+++ b/server/storage.js
@@ -90,11 +90,10 @@ function ttl(id) {
 function filename(id) {
   return new Promise((resolve, reject) => {
     redis_client.hget(id, 'filename', (err, reply) => {
-      if (!err) {
-        resolve(reply);
-      } else {
-        reject(err);
+      if (err || !reply) {
+        return reject();
       }
+      resolve(reply);
     });
   });
 }