diff --git a/services/filestore/app.js b/services/filestore/app.js
index e48e8ae3c8..278997b9aa 100644
--- a/services/filestore/app.js
+++ b/services/filestore/app.js
@@ -156,4 +156,13 @@ if (!module.parent) {
   })
 }
 
+process
+  .on('unhandledRejection', (reason, p) => {
+    logger.err(reason, 'Unhandled Rejection at Promise', p)
+  })
+  .on('uncaughtException', err => {
+    logger.err(err, 'Uncaught Exception thrown')
+    process.exit(1)
+  })
+
 module.exports = app