diff --git a/package.json b/package.json
index 66cbacc..a344ae2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "command-and-control-service",
-  "version": "7.2.13",
+  "version": "7.2.14",
   "description": "command-and-control-service an Octoblu Service",
   "keywords": [
     "Octoblu",
diff --git a/src/services/message-service.coffee b/src/services/message-service.coffee
index c73192c..84dac1e 100644
--- a/src/services/message-service.coffee
+++ b/src/services/message-service.coffee
@@ -30,8 +30,10 @@ class MessageService
 
   resolve: (callback) =>
     @resolver.resolve @device, (error, resolvedDevice) =>
+      debug error.stack if error?
+      return callback error if error?
       @device = resolvedDevice if resolvedDevice?
-      callback error
+      callback()
 
   process: (callback) =>
     debug 'messageService.create'