diff --git a/lib/apiserver/index.js b/lib/apiserver/index.js
index d7cf887..5ebd0b7 100644
--- a/lib/apiserver/index.js
+++ b/lib/apiserver/index.js
@@ -28,7 +28,7 @@ const app = express();
 messagingService.setTransport(transport);
 
 function apikeyChecker(req, res, next) {
-    res.locals.has_valid_apikey = req.params.apikey === (config.apiserver.apikey || config.handler_callback_server.apikey);
+    res.locals.has_valid_apikey = req.params.apikey === ((config.apiserver && config.apiserver.apikey ? config.apiserver.apikey : null) || config.handler_callback_server.apikey);
     if (res.locals.has_valid_apikey) {
         next();
     }
diff --git a/lib/transport.js b/lib/transport.js
index dcc4844..9c14e89 100644
--- a/lib/transport.js
+++ b/lib/transport.js
@@ -16,6 +16,7 @@ const modemSelect = require('./modemSelect');
 const modems = require('./modems2');
 const partnerLastSeen = require('./partner-last-seen');
 const history = require('./history');
+const prefixes = require('./prefixes');
 
 function _send(destinationNumber, msg, handlerIMSI) {
 
@@ -114,6 +115,8 @@ async function send(partner, msg) {
     if (!msg) return;
 
     const destinationNumber = modemSelect.removeSuffixFromNumber(partner, config);
+    const prefixName = await prefixes(destinationNumber);
+    logger.verbose('Destination number prefix lookup', {partner: destinationNumber, prefix: prefixName});
 
     // logger.verbose('Choosing handler name', { partner, destinationNumber, msg, origin });
     const handlerIMSI = await partnerLastSeen.get(destinationNumber) ;