diff --git a/partner-komodo.js b/partner-komodo.js
index 676368e..faca233 100644
--- a/partner-komodo.js
+++ b/partner-komodo.js
@@ -110,6 +110,12 @@ function topupRequest(task, pendingOnConnectError) {
         }
 
         let result = parsePartnerMessage(body);
+
+        if (!result) {
+            callbackReport(task.requestId, '40', 'Error parsing response from partner. Partner response: ' + body, {task: task});
+            return;
+        }
+
         processPartnerResponse(result, task);
 
     })
@@ -120,18 +126,6 @@ function topupAdvice(task) {
 }
 
 function processPartnerResponse(resObj, task) {
-    if (!resObj) {
-
-        if (task && task.requestId) {
-            callbackReport(task.requestId, '40', 'Error parsing response from partner. Partner response: ' + body, {task: task});
-        }
-        else {
-            logger.warn('UNDEFINED REQUEST ID');
-        }
-
-        return;
-    }
-
     let st24Rc = '68';
 
     if (komodoRc[resObj.rc]) {