diff --git a/index.js b/index.js
index f6d428c..08d07e4 100644
--- a/index.js
+++ b/index.js
@@ -1,7 +1,6 @@
-"use strict";
+const DEBUG_ON_NON_JSON_DIRECT_RESPONSE = !!(process.env.DEBUG_ON_NON_JSON_DIRECT_RESPONSE)
 
 const request = require('request');
-
 const config = require('komodo-sdk/config');
 const logger = require('komodo-sdk/logger');
 
@@ -45,7 +44,7 @@ function onIncomingMessage(params) {
     logger.verbose('MESSAGING-CLIENT-LIB: Sending report to messaging service');
     request(requestOptions, function(err, res, body) {
         if (err) {
-            logger.warn('MESSAGING-CLIENT-LIB: error on request to CORE', {err: err});
+            logger.warn('MESSAGING-CLIENT-LIB: error on request to messaging service', {err: err});
             return;
         }
 
@@ -56,7 +55,14 @@ function onIncomingMessage(params) {
             var data = JSON.parse(body);
         }
         catch(e) {
-            //logger.verbose('Direct response is not on JSON format, forwarding raw response');
+            if (DEBUG_ON_NON_JSON_DIRECT_RESPONSE) {
+                logger.verbose('MESSAGING-CLIENT-LIB: direct response is not on JSON format, forwarding raw response', {
+                    partner: params.partner,
+                    msg: params.msg.trim(),
+                    directResponse: body,
+                });
+            }
+
             sendToPartner(params.partner, body);
             return;
         }