diff --git a/src/main.ts b/src/main.ts
index 516027a..ef82f58 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -3,6 +3,7 @@ import * as Mongo from 'mongodb'
 import * as Queue from './queue'
 import * as MqttMessage from './mqtt_message'
 
+
 var console = require('chalk-console')
 
 
@@ -40,7 +41,7 @@ Mongo.MongoClient.connect(options['database'],
       dbHandle = tmpDbHandle
       dbReady = true; 
       console.info("Connected to database")
-      dbHandle.on('error', () => { console.warn("Error on database") })
+      dbHandle.on('reconnectFailed', (err : any) => { console.warn(`Error on database ${err}`) })
       dbHandle.on('reconnect', () => { 
         console.info("Reconnect on database") 
         dbReady = true
@@ -61,7 +62,7 @@ Mongo.MongoClient.connect(options['database'],
 
 var queue = new Queue.Queue<MqttMessage.MqttMessage>()
 queue.on('data', () => {
-  if (dbReady || true) {  // FIXME
+  if (dbReady) { 
     while (! queue.isEmpty()) {
       var msg : MqttMessage.MqttMessage = queue.deq()
       console.info(`Something in the queue: ${JSON.stringify(msg)}`)