diff --git a/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js b/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js
index c0f0718ddf393a75d2bc08df22a00916911d6eef..23b999b3f0498709b35962ab3d5236e1e3cf1d96 100644
--- a/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js
+++ b/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js
@@ -2711,10 +2711,10 @@ if(client_id.toLowerCase() === 'android'){
     var parser = new DOMParser();
     var error_message = (new URLSearchParams(window.location.search)).get('error_message');
     console.log('before error_message parse => ', error_message); // TODO: log!
-    error_message = parser.parseFromString(error_message, 'text/html');
+    if (error_message) error_message = parser.parseFromString(error_message, 'text/html');
     console.log('after error_message parse => ', error_message); // TODO: log!`
     var success_message = (new URLSearchParams(window.location.search)).get('success_message');
-    success_message = parser.parseFromString(success_message, 'text/html');
+    if (success_message) success_message = parser.parseFromString(success_message, 'text/html');
 
     if(error_message){
         var error_msg = document.getElementById('error-msg');