diff --git a/android/build.gradle b/android/build.gradle
index a06d876..edd8c3b 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -20,13 +20,13 @@ android {
 
 dependencies {
     compile 'com.facebook.react:react-native:0.20.+'
-    compile 'com.google.android.gms:play-services-base:9.8.0'
+    compile 'com.google.android.gms:play-services-base:9.6.0'
 
-    compile 'com.google.firebase:firebase-core:9.8.0'
-    compile 'com.google.firebase:firebase-auth:9.8.0'
-    compile 'com.google.firebase:firebase-analytics:9.8.0'
-    compile 'com.google.firebase:firebase-database:9.8.0'
-    compile 'com.google.firebase:firebase-storage:9.8.0'
-    compile 'com.google.firebase:firebase-messaging:9.8.0'
+    compile 'com.google.firebase:firebase-core:9.6.0'
+    compile 'com.google.firebase:firebase-auth:9.6.0'
+    compile 'com.google.firebase:firebase-analytics:9.6.0'
+    compile 'com.google.firebase:firebase-database:9.6.0'
+    compile 'com.google.firebase:firebase-storage:9.6.0'
+    compile 'com.google.firebase:firebase-messaging:9.6.0'
 }
 
diff --git a/android/src/main/java/io/fullstack/firestack/FirestackAuth.java b/android/src/main/java/io/fullstack/firestack/FirestackAuth.java
index 7c0c2bb..af783c1 100644
--- a/android/src/main/java/io/fullstack/firestack/FirestackAuth.java
+++ b/android/src/main/java/io/fullstack/firestack/FirestackAuth.java
@@ -1,3 +1,4 @@
+
 package io.fullstack.firestack;
 
 import android.content.Context;
@@ -99,21 +100,30 @@ public void unlistenForAuth(final Callback callback) {
     }
 
     @ReactMethod
-    public void createUserWithEmail(final String email, final String password, final Callback onComplete) {
+    public void createUserWithEmail(final String email, final String password, final Callback callback) {
       mAuth = FirebaseAuth.getInstance();
 
       mAuth.createUserWithEmailAndPassword(email, password)
               .addOnCompleteListener(new OnCompleteListener<AuthResult>() {
                   @Override
                   public void onComplete(@NonNull Task<AuthResult> task) {
-                      if (task.isSuccessful()) {
+                      try {
+                        if (task.isSuccessful()) {
                           FirestackAuthModule.this.user = task.getResult().getUser();
-                          userCallback(FirestackAuthModule.this.user, onComplete);
-                      }else{
-                          userErrorCallback(task, onComplete);
+                          userCallback(FirestackAuthModule.this.user, callback);
+                        } else {
+                          userErrorCallback(task, callback);
+                        }
+                      } catch (Exception ex) {
+                        userExceptionCallback(ex, callback);
                       }
                   }
-              });
+            }).addOnFailureListener(new OnFailureListener() {
+              @Override
+              public void onFailure(@NonNull Exception ex) {
+                userExceptionCallback(ex, callback);
+              }
+            });
     }
 
     @ReactMethod
@@ -124,14 +134,23 @@ public void signInWithEmail(final String email, final String password, final Cal
           .addOnCompleteListener(new OnCompleteListener<AuthResult>() {
               @Override
               public void onComplete(@NonNull Task<AuthResult> task) {
-                  if (task.isSuccessful()) {
+                try {
+                    if (task.isSuccessful()) {
                       FirestackAuthModule.this.user = task.getResult().getUser();
                       userCallback(FirestackAuthModule.this.user, callback);
-                  } else {
+                    } else {
                       userErrorCallback(task, callback);
+                    }
+                  } catch (Exception ex) {
+                    userExceptionCallback(ex, callback);
                   }
+                }
+            }).addOnFailureListener(new OnFailureListener() {
+              @Override
+              public void onFailure(@NonNull Exception ex) {
+                userExceptionCallback(ex, callback);
               }
-          });
+            });
     }
 
     @ReactMethod
@@ -155,15 +174,23 @@ public void signInAnonymously(final Callback callback) {
                     public void onComplete(@NonNull Task<AuthResult> task) {
                         Log.d(TAG, "signInAnonymously:onComplete:" + task.isSuccessful());
 
-                        if (task.isSuccessful()) {
+                      try {
+                          if (task.isSuccessful()) {
                             FirestackAuthModule.this.user = task.getResult().getUser();
                             anonymousUserCallback(FirestackAuthModule.this.user, callback);
-                        }else{
+                          } else {
                             userErrorCallback(task, callback);
+                          }
+                        } catch (Exception ex) {
+                          userExceptionCallback(ex, callback);
                         }
-                    }
-                });
-
+                      }
+              }).addOnFailureListener(new OnFailureListener() {
+                @Override
+                public void onFailure(@NonNull Exception ex) {
+                  userExceptionCallback(ex, callback);
+                }
+              });
     }
 
     @ReactMethod
@@ -175,14 +202,23 @@ public void signInWithCustomToken(final String customToken, final Callback callb
             @Override
             public void onComplete(@NonNull Task<AuthResult> task) {
                 Log.d(TAG, "signInWithCustomToken:onComplete:" + task.isSuccessful());
-                if (task.isSuccessful()) {
-                    FirestackAuthModule.this.user = task.getResult().getUser();
+                try {
+                  if (task.isSuccessful()) {
+                      FirestackAuthModule.this.user = task.getResult().getUser();
                     userCallback(FirestackAuthModule.this.user, callback);
-                } else {
-                    userErrorCallback(task, callback);
+                  } else {
+                      userErrorCallback(task, callback);
+                  }
+                } catch (Exception ex) {
+                  userExceptionCallback(ex, callback);
                 }
             }
-        });
+        }).addOnFailureListener(new OnFailureListener() {
+              @Override
+              public void onFailure(@NonNull Exception ex) {
+                userExceptionCallback(ex, callback);
+              }
+            });
     }
 
     @ReactMethod
@@ -202,15 +238,24 @@ public void updateUserEmail(final String email, final Callback callback) {
           .addOnCompleteListener(new OnCompleteListener<Void>() {
             @Override
             public void onComplete(@NonNull Task<Void> task) {
-              if (task.isSuccessful()) {
-                Log.d(TAG, "User email address updated");
-                FirebaseUser u = FirebaseAuth.getInstance().getCurrentUser();
-                userCallback(u, callback);
-              } else {
-                userErrorCallback(task, callback);
+              try {
+                if (task.isSuccessful()) {
+                  Log.d(TAG, "User email address updated");
+                  FirebaseUser u = FirebaseAuth.getInstance().getCurrentUser();
+                  userCallback(u, callback);
+                } else {
+                  userErrorCallback(task, callback);
+                }
+              } catch (Exception ex) {
+                userExceptionCallback(ex, callback);
               }
             }
-          });
+          }).addOnFailureListener(new OnFailureListener() {
+              @Override
+              public void onFailure(@NonNull Exception ex) {
+                userExceptionCallback(ex, callback);
+              }
+            });
       } else {
         WritableMap err = Arguments.createMap();
         err.putInt("errorCode", NO_CURRENT_USER);
@@ -228,16 +273,25 @@ public void updateUserPassword(final String newPassword, final Callback callback
           .addOnCompleteListener(new OnCompleteListener<Void>() {
             @Override
             public void onComplete(@NonNull Task<Void> task) {
-              if (task.isSuccessful()) {
-                Log.d(TAG, "User password updated");
+              try {
+                if (task.isSuccessful()) {
+                  Log.d(TAG, "User password updated");
 
-                FirebaseUser u = FirebaseAuth.getInstance().getCurrentUser();
-                userCallback(u, callback);
-              } else {
-                userErrorCallback(task, callback);
+                  FirebaseUser u = FirebaseAuth.getInstance().getCurrentUser();
+                  userCallback(u, callback);
+                } else {
+                  userErrorCallback(task, callback);
+                }
+              } catch (Exception ex) {
+                userExceptionCallback(ex, callback);
               }
             }
-          });
+          }).addOnFailureListener(new OnFailureListener() {
+              @Override
+              public void onFailure(@NonNull Exception ex) {
+                userExceptionCallback(ex, callback);
+              }
+            });
       } else {
         WritableMap err = Arguments.createMap();
         err.putInt("errorCode", NO_CURRENT_USER);
@@ -254,6 +308,7 @@ public void sendPasswordResetWithEmail(final String email, final Callback callba
                 .addOnCompleteListener(new OnCompleteListener<Void>() {
                     @Override
                     public void onComplete(@NonNull Task<Void> task) {
+                      try {
                         if(task.isSuccessful()){
                             WritableMap resp = Arguments.createMap();
                             resp.putString("status", "complete");
@@ -261,8 +316,16 @@ public void onComplete(@NonNull Task<Void> task) {
                         }else{
                             callback.invoke(task.getException().toString());
                         }
+                      } catch (Exception ex) {
+                        userExceptionCallback(ex, callback);
+                      }
                     }
-                });
+              }).addOnFailureListener(new OnFailureListener() {
+              @Override
+              public void onFailure(@NonNull Exception ex) {
+                userExceptionCallback(ex, callback);
+              }
+            });
     }
 
     @ReactMethod
@@ -274,17 +337,26 @@ public void deleteUser(final Callback callback) {
           .addOnCompleteListener(new OnCompleteListener<Void>() {
             @Override
             public void onComplete(@NonNull Task<Void> task) {
-              if (task.isSuccessful()) {
-                Log.d(TAG, "User account deleted");
-                WritableMap resp = Arguments.createMap();
-                resp.putString("status", "complete");
-                resp.putString("msg", "User account deleted");
-                callback.invoke(null, resp);
-              } else {
-                userErrorCallback(task, callback);
+              try {
+                if (task.isSuccessful()) {
+                  Log.d(TAG, "User account deleted");
+                  WritableMap resp = Arguments.createMap();
+                  resp.putString("status", "complete");
+                  resp.putString("msg", "User account deleted");
+                  callback.invoke(null, resp);
+                } else {
+                  userErrorCallback(task, callback);
+                }
+              } catch (Exception ex) {
+                userExceptionCallback(ex, callback);
               }
             }
-          });
+          }).addOnFailureListener(new OnFailureListener() {
+              @Override
+              public void onFailure(@NonNull Exception ex) {
+                userExceptionCallback(ex, callback);
+              }
+            });
       } else {
         WritableMap err = Arguments.createMap();
         err.putInt("errorCode", NO_CURRENT_USER);
@@ -301,20 +373,29 @@ public void getToken(final Callback callback) {
         .addOnCompleteListener(new OnCompleteListener<GetTokenResult>() {
           @Override
           public void onComplete(@NonNull Task<GetTokenResult> task) {
-            if (task.isSuccessful()) {
-              String token = task.getResult().getToken();
-              WritableMap resp = Arguments.createMap();
-              resp.putString("status", "complete");
-              resp.putString("token", token);
-              callback.invoke(null, resp);
-            } else {
-              WritableMap err = Arguments.createMap();
-              err.putInt("errorCode", ERROR_FETCHING_TOKEN);
-              err.putString("errorMessage", task.getException().getMessage());
-              callback.invoke(err);
+            try {
+              if (task.isSuccessful()) {
+                String token = task.getResult().getToken();
+                WritableMap resp = Arguments.createMap();
+                resp.putString("status", "complete");
+                resp.putString("token", token);
+                callback.invoke(null, resp);
+              } else {
+                WritableMap err = Arguments.createMap();
+                err.putInt("errorCode", ERROR_FETCHING_TOKEN);
+                err.putString("errorMessage", task.getException().getMessage());
+                callback.invoke(err);
+              }
+            } catch (Exception ex) {
+              userExceptionCallback(ex, callback);
             }
           }
-        });
+        }).addOnFailureListener(new OnFailureListener() {
+              @Override
+              public void onFailure(@NonNull Exception ex) {
+                userExceptionCallback(ex, callback);
+              }
+            });
     }
 
     @ReactMethod
@@ -342,15 +423,24 @@ public void updateUserProfile(ReadableMap props, final Callback callback) {
         .addOnCompleteListener(new OnCompleteListener<Void>() {
           @Override
           public void onComplete(@NonNull Task<Void> task) {
-            if (task.isSuccessful()) {
-              Log.d(TAG, "User profile updated");
-              FirebaseUser u = FirebaseAuth.getInstance().getCurrentUser();
-              userCallback(u, callback);
-            } else {
-              userErrorCallback(task, callback);
+            try {
+              if (task.isSuccessful()) {
+                Log.d(TAG, "User profile updated");
+                FirebaseUser u = FirebaseAuth.getInstance().getCurrentUser();
+                userCallback(u, callback);
+              } else {
+                userErrorCallback(task, callback);
+              }
+            } catch (Exception ex) {
+              userExceptionCallback(ex, callback);
             }
           }
-        });
+        }).addOnFailureListener(new OnFailureListener() {
+              @Override
+              public void onFailure(@NonNull Exception ex) {
+                userExceptionCallback(ex, callback);
+              }
+            });
     }
 
     @ReactMethod
@@ -386,14 +476,23 @@ public void googleLogin(String IdToken, final Callback callback) {
                 .addOnCompleteListener(new OnCompleteListener<AuthResult>() {
                     @Override
                     public void onComplete(@NonNull Task<AuthResult> task) {
+                      try {
                         if (task.isSuccessful()) {
                             FirestackAuthModule.this.user = task.getResult().getUser();
                             userCallback(FirestackAuthModule.this.user, callback);
                         }else{
                             userErrorCallback(task, callback);
                         }
+                      } catch (Exception ex) {
+                        userExceptionCallback(ex, callback);
+                      }
                     }
-                });
+                }).addOnFailureListener(new OnFailureListener() {
+              @Override
+              public void onFailure(@NonNull Exception ex) {
+                userExceptionCallback(ex, callback);
+              }
+            });
     }
 
     @ReactMethod
@@ -405,18 +504,27 @@ public void facebookLogin(String Token, final Callback callback) {
                 .addOnCompleteListener(new OnCompleteListener<AuthResult>() {
                     @Override
                     public void onComplete(@NonNull Task<AuthResult> task) {
+                      try {
                         if (task.isSuccessful()) {
                             FirestackAuthModule.this.user = task.getResult().getUser();
                             userCallback(FirestackAuthModule.this.user, callback);
                         }else{
                             userErrorCallback(task, callback);
                         }
+                      } catch (Exception ex) {
+                        userExceptionCallback(ex, callback);
+                      }
                     }
-                });
+                }).addOnFailureListener(new OnFailureListener() {
+              @Override
+              public void onFailure(@NonNull Exception ex) {
+                userExceptionCallback(ex, callback);
+              }
+            });
     }
 
     // Internal helpers
-    public void userCallback(FirebaseUser passedUser, final Callback onComplete) {
+    public void userCallback(FirebaseUser passedUser, final Callback callback) {
 
         if (passedUser == null) {
           mAuth = FirebaseAuth.getInstance();
@@ -439,13 +547,18 @@ public void onComplete(@NonNull Task<GetTokenResult> task) {
 
                 msgMap.putMap("user", userMap);
 
-                onComplete.invoke(null, msgMap);
+                callback.invoke(null, msgMap);
             }
-        });
+        }).addOnFailureListener(new OnFailureListener() {
+              @Override
+              public void onFailure(@NonNull Exception ex) {
+                userExceptionCallback(ex, callback);
+              }
+            });
     }
 
     // TODO: Reduce to one method
-    public void anonymousUserCallback(FirebaseUser passedUser, final Callback onComplete) {
+    public void anonymousUserCallback(FirebaseUser passedUser, final Callback callback) {
 
         if (passedUser == null) {
           mAuth = FirebaseAuth.getInstance();
@@ -454,7 +567,8 @@ public void anonymousUserCallback(FirebaseUser passedUser, final Callback onComp
           this.user = passedUser;
         }
 
-        this.user.getToken(true).addOnCompleteListener(new OnCompleteListener<GetTokenResult>() {
+        this.user.getToken(true)
+        .addOnCompleteListener(new OnCompleteListener<GetTokenResult>() {
             @Override
             public void onComplete(@NonNull Task<GetTokenResult> task) {
                 WritableMap msgMap = Arguments.createMap();
@@ -469,9 +583,14 @@ public void onComplete(@NonNull Task<GetTokenResult> task) {
 
                 msgMap.putMap("user", userMap);
 
-                onComplete.invoke(null, msgMap);
+                callback.invoke(null, msgMap);
             }
-        });
+        }).addOnFailureListener(new OnFailureListener() {
+              @Override
+              public void onFailure(@NonNull Exception ex) {
+                userExceptionCallback(ex, callback);
+              }
+            });
     }
 
 
@@ -494,6 +613,15 @@ public void userErrorCallback(Task task, final Callback onFail) {
         onFail.invoke(error);
     }
 
+    public void userExceptionCallback(Exception ex, final Callback onFail) {
+      WritableMap error = Arguments.createMap();
+      error.putInt("errorCode", ex.hashCode());
+      error.putString("errorMessage", ex.getMessage());
+      error.putString("allErrorMessage", ex.toString());
+
+      onFail.invoke(error);
+    }
+
     private WritableMap getUserMap() {
         WritableMap userMap = Arguments.createMap();