diff --git a/utils/db-helper.js b/utils/db-helper.js
index b4f2ef0..0d401b9 100644
--- a/utils/db-helper.js
+++ b/utils/db-helper.js
@@ -2,6 +2,7 @@
  * Copyright (c) 2018 TopCoder, Inc. All rights reserved.
  */
 'use strict';
+const _ = require('lodash');
 const logger = require('./logger');
 
 /**
@@ -68,12 +69,12 @@ async function queryOneIssue(model, repositoryId, number, provider) {
     .eq(provider)
     .all()
     .exec((err, result) => {
-      if (err) {
+      if (err || !result) {
         logger.debug(`queryOne. Error. ${err}`);
         return reject(err);
       }
       logger.debug('queryOne. Result.');
-      logger.debug(result);
+      logger.debug(JSON.stringify(_.map(result, (o) => _.omit(o, ['$__', 'body']))));
 
       return resolve(result.count === 0 ? null : result[0]);
     });
@@ -91,12 +92,12 @@ async function scanOne(model, scanParams) {
 
   return await new Promise((resolve, reject) => {
     model.scan(scanParams).consistent().all().exec((err, result) => {
-      if (err) {
+      if (err || !result) {
         logger.debug(`scanOne. Error. ${err}`);
         return reject(err);
       }
       logger.debug('scanOne. Result.');
-      logger.debug(result);
+      logger.debug(JSON.stringify(_.map(result, (o) => _.omit(o, ['$__', 'body']))));
 
       return resolve(result.count === 0 ? null : result[0]);
     });
diff --git a/utils/kafka.js b/utils/kafka.js
index d70189b..976b99e 100644
--- a/utils/kafka.js
+++ b/utils/kafka.js
@@ -35,13 +35,13 @@ class Kafka {
   messageHandler(messageSet) {
     logger.debug(` topics ======= ${JSON.stringify(messageSet)}`);
     messageSet.forEach((item) => {
-      logger.debug(`received message from kafka: ${item.message.value.toString('utf8')}`);
-
       // The event should be a JSON object
       let event;
       try {
-        event = JSON.parse(item.message.value.toString('utf8'));
-        event = JSON.parse(event.payload.value);
+        const message = JSON.parse(item.message.value.toString('utf8'));
+        event = JSON.parse(message.payload.value);
+        message.payload.value = event;
+        logger.debug(`received message from kafka: ${JSON.stringify(_.omit(message, 'payload.value.data.issue.body'))}`);
       } catch (err) {
         logger.error(`"message" is not a valid JSON-formatted string: ${err.message}`);
         return;