diff --git a/app/js/controllers.js b/app/js/controllers.js
index b7d18418..ad48b9b5 100644
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@@ -360,11 +360,13 @@ angular.module('myApp.controllers', ['myApp.i18n'])
         switch (error.type) {
           case 'PASSWORD_EMPTY':
             $scope.logIn();
+            error.handled = true;
             break;
           case 'PASSWORD_RECOVERY_NA':
             $timeout(function () {
               $scope.canReset = true;
             }, 1000);
+            error.handled = true;
             break;
         }
       })
diff --git a/app/js/lib/tl_utils.js b/app/js/lib/tl_utils.js
index 1def7b57..0c9c0071 100644
--- a/app/js/lib/tl_utils.js
+++ b/app/js/lib/tl_utils.js
@@ -599,7 +599,7 @@ TLDeserialization.prototype.fetchObject = function (type, field) {
       }
     }
     if (!constructorData) {
-      throw new Error('Constructor not found: ' + constructor);
+      throw new Error('Constructor not found: ' + constructor +' '+ this.fetchInt()+' '+ this.fetchInt());
     }
   }
 
diff --git a/app/js/locales/en-us.json b/app/js/locales/en-us.json
index e422b3f6..c538d351 100644
--- a/app/js/locales/en-us.json
+++ b/app/js/locales/en-us.json
@@ -423,8 +423,8 @@
 	"login_generating_key": "Generating keys",
 	"login_generating_keys_info": "Keys are only generated once. This can take a few minutes on slower devices, please be patient.",
 	"login_edit_number": "Edit phone number",
-	"login_enter_code_label_md": "Please enter the code you've just received in your other **Telegram** app",
-	"login_code_not_received": "Haven't received the code?",
+	"login_enter_code_label_md": "We've sent you a code via **Telegram** (not SMS).\nPlease check your Telegram messages and enter the code below.",
+	"login_code_not_received": "Send code via SMS",
 	"login_enter_sms_code_label_md": "We have sent you a code via SMS.\nPlease enter it below.",
 	"login_call_remaining": "Telegram will call you in {remaining}",
 	"login_calling": "Telegram is calling you",