diff --git a/lib/custom-ping.js b/lib/custom-ping.js
index 745879c..fde6061 100644
--- a/lib/custom-ping.js
+++ b/lib/custom-ping.js
@@ -2,11 +2,13 @@ const MODULE_NAME = 'CUSTOM-PING';
 
 const uniqid = require('uniqid');
 const config = require('komodo-sdk/config');
-const logger = require('komodo-sdk/logger');
+const logger = require('tektrans-logger');
 
 let bot;
 
-const allowedFromPartnerList = (config.custom_ping.allowed_from_partners || [])
+const allowedFromPartnerList = (
+    (config.custom_ping && config.custom_ping.allowed_from_partners) || []
+)
     .filter((item) => typeof item === 'string')
     .map((item) => (item || '').trim().toUpperCase())
     .filter((item) => item);
@@ -85,8 +87,8 @@ const pingSender = () => {
     });
 };
 
-if (config.custom_ping.send_to) {
-    const intervalMs = (config.custom_ping && config.custom_ping.interval_ms) || 25 * 1000;
+if (config.custom_ping && config.custom_ping.send_to) {
+    const intervalMs = config.custom_ping.interval_ms || (25 * 1000);
     logger.verbose(`${MODULE_NAME} 324034EE: Registering ping sender`, {
         intervalMs,
         partners: config.custom_ping.send_to,
diff --git a/lib/transport.js b/lib/transport.js
index 0237f9d..e9959b1 100644
--- a/lib/transport.js
+++ b/lib/transport.js
@@ -3,7 +3,7 @@ const SLEEP_BEFORE_TERMINATE_ON_ERROR_MS = 5 * 1000;
 
 const bot = require('simple-xmpp');
 const config = require('komodo-sdk/config');
-const logger = require('komodo-sdk/logger');
+const logger = require('tektrans-logger');
 const messagingService = require('komodo-center-messaging-client-lib');
 const uniqid = require('uniqid');