diff --git a/spec/ParseUser.spec.js b/spec/ParseUser.spec.js
index 16ff4dcd23..9523f20d63 100644
--- a/spec/ParseUser.spec.js
+++ b/spec/ParseUser.spec.js
@@ -1514,6 +1514,29 @@ describe('Parse.User testing', () => {
     });
   });
 
+  it('should properly error when password is missing', (done) => {
+    var provider = getMockFacebookProvider();
+    Parse.User._registerAuthenticationProvider(provider);
+    Parse.User._logInWith("facebook", {
+      success: function(user) {
+        user.set('username', 'myUser');
+        user.set('email', 'foo@example.com');
+        user.save().then(() => {
+          return Parse.User.logOut();
+        }).then(() => {
+          return Parse.User.logIn('myUser', 'password');
+        }).then(() => {
+          fail('should not succeed');
+          done();
+        }, (err) => {
+          expect(err.code).toBe(Parse.Error.OBJECT_NOT_FOUND);
+          expect(err.message).toEqual('Invalid username/password.');
+          done();
+        })
+      }
+    });
+  });
+
   it('should have authData in beforeSave and afterSave', (done) => {
 
     Parse.Cloud.beforeSave('_User', (request, response) => {
diff --git a/src/password.js b/src/password.js
index f1154c96e6..a3eaa4bfb5 100644
--- a/src/password.js
+++ b/src/password.js
@@ -19,6 +19,10 @@ function hash(password) {
 // hashed password.
 function compare(password, hashedPassword) {
   return new Promise(function(fulfill, reject) {
+    // Cannot bcrypt compare when one is undefined
+    if (!password || !hashedPassword) {
+      return fulfill(false);
+    }
     bcrypt.compare(password, hashedPassword, function(err, success) {
       if (err) {
         reject(err);