diff --git a/src/controllers/users.js b/src/controllers/users.js
index 7f76af8..c7d82ca 100644
--- a/src/controllers/users.js
+++ b/src/controllers/users.js
@@ -87,15 +87,23 @@ router.put('/:id',
 router.delete('/:id',
   ensureUser,
   async (ctx) => {
-    const user = await User.findById(ctx.params.id)
+    try {
+      const user = await User.findById(ctx.params.id)
+      if (!user) {
+        ctx.throw(404)
+      }
 
-    if (!user) {
-      ctx.throw(404)
+      await user.remove()
+
+      ctx.body = 200
+    } catch (err) {
+
+      if (err === 404 || err.name === 'CastError') {
+        ctx.throw(404)
+      }
+
+      ctx.throw(500)
     }
-
-    await user.remove()
-
-    ctx.body = 200
   }
 )