diff --git a/js/libtextsecure.js b/js/libtextsecure.js
index efe293a9e5..ac413aa476 100644
--- a/js/libtextsecure.js
+++ b/js/libtextsecure.js
@@ -34708,6 +34708,9 @@ window.axolotl.protocol = function(storage_interface) {
                                 throw e;
                             }
                         }
+                        if (message.preKeyId && !preKeyPair) {
+                          console.log('Invalid prekey id');
+                        }
                         return initSession(false, preKeyPair, signedPreKeyPair, encodedNumber, toArrayBuffer(message.identityKey), toArrayBuffer(message.baseKey), undefined)
                                         .then(function(new_session) {
                             // Note that the session is not actually saved until the very end of decryptWhisperMessage
@@ -36776,6 +36779,7 @@ var TextSecureServer = (function() {
             var generateKeys = this.generateKeys.bind(this, 100);
             var registerKeys = this.server.registerKeys.bind(this.server);
             return this.server.getMyKeys().then(function(preKeyCount) {
+                console.log('prekey count ' + preKeyCount);
                 if (preKeyCount < 10) {
                     return generateKeys().then(registerKeys);
                 }
diff --git a/libtextsecure/account_manager.js b/libtextsecure/account_manager.js
index fe22d5cf67..cca00856fc 100644
--- a/libtextsecure/account_manager.js
+++ b/libtextsecure/account_manager.js
@@ -83,6 +83,7 @@
             var generateKeys = this.generateKeys.bind(this, 100);
             var registerKeys = this.server.registerKeys.bind(this.server);
             return this.server.getMyKeys().then(function(preKeyCount) {
+                console.log('prekey count ' + preKeyCount);
                 if (preKeyCount < 10) {
                     return generateKeys().then(registerKeys);
                 }
diff --git a/libtextsecure/libaxolotl.js b/libtextsecure/libaxolotl.js
index 426d45ffab..884a4625f8 100644
--- a/libtextsecure/libaxolotl.js
+++ b/libtextsecure/libaxolotl.js
@@ -34594,6 +34594,9 @@ window.axolotl.protocol = function(storage_interface) {
                                 throw e;
                             }
                         }
+                        if (message.preKeyId && !preKeyPair) {
+                          console.log('Invalid prekey id');
+                        }
                         return initSession(false, preKeyPair, signedPreKeyPair, encodedNumber, toArrayBuffer(message.identityKey), toArrayBuffer(message.baseKey), undefined)
                                         .then(function(new_session) {
                             // Note that the session is not actually saved until the very end of decryptWhisperMessage