diff --git a/app.js b/app.js
index 9b7d62c..9942bb4 100644
--- a/app.js
+++ b/app.js
@@ -14,3 +14,6 @@ catch(err) {
 module.exports=mcServer.createMCServer(settings);
 
 
+process.on('unhandledRejection', err => {
+  console.log(err.stack);
+});
\ No newline at end of file
diff --git a/src/index.js b/src/index.js
index ebdf880..d002739 100644
--- a/src/index.js
+++ b/src/index.js
@@ -41,8 +41,5 @@ class MCServer extends EventEmitter {
     this._server.on('error', error => this.emit('error',error));
     this._server.on('listening', () => this.emit('listening',this._server.socketServer.address().port));
     this.emit('asap');
-
-    //process.on('unhandledRejection', err => this.emit('error',err));
-    // TODO better catch all promises: using this make it impossible to run 2 servers in one process
   }
 }
\ No newline at end of file