diff --git a/client/src/main/java/org/dreamexposure/discal/client/network/google/GoogleExternalAuth.java b/client/src/main/java/org/dreamexposure/discal/client/network/google/GoogleExternalAuth.java
index 6c80f2a8..7f593378 100644
--- a/client/src/main/java/org/dreamexposure/discal/client/network/google/GoogleExternalAuth.java
+++ b/client/src/main/java/org/dreamexposure/discal/client/network/google/GoogleExternalAuth.java
@@ -222,13 +222,19 @@ public class GoogleExternalAuth {
                                         .flatMap(em -> Messages.sendDirectMessage(em, poll.getUser()))
                                         .doOnNext(s -> LogFeed.log(LogObject.forDebug("Auth 200: 3.1")))
                                         .then(Mono.just(GlobalConst.NOT_EMPTY))
-                                    ))
+                                    ).doOnNext(i -> LogFeed.log(LogObject.forDebug("Auth 200: 3.2"))))
                                 .switchIfEmpty(Messages.sendDirectMessage(
                                     Messages.getMessage("AddCalendar.Auth.Poll.Failure.ListCalendars", gs)
                                     , poll.getUser()).then(Mono.empty()))
                                 .doOnNext(s -> LogFeed.log(LogObject.forDebug("Auth 200: 4")))
                                 .then(Mono.error(new GoogleAuthCancelException()));
-                        });
+                        })
+                            .doOnNext(s -> LogFeed.log(LogObject.forDebug("Auth 200: 5")))
+                            .switchIfEmpty(Mono.defer(() -> {
+                                LogFeed.log(LogObject.forDebug("Auth 200: Empty????"));
+
+                                return Mono.empty(); //For now, so we aren't breaking things more...
+                            }));
                     } else {
                         //Unknown network error...
                         LogFeed.log(LogObject.forDebug("Network error; poll failure", "Status code: " + response.code()
diff --git a/core/src/main/java/org/dreamexposure/discal/core/database/DatabaseManager.java b/core/src/main/java/org/dreamexposure/discal/core/database/DatabaseManager.java
index f1c22d51..92cbc891 100644
--- a/core/src/main/java/org/dreamexposure/discal/core/database/DatabaseManager.java
+++ b/core/src/main/java/org/dreamexposure/discal/core/database/DatabaseManager.java
@@ -232,6 +232,7 @@ public class DatabaseManager {
                         .bind(15, set.isBranded())
                         .execute())
                     ).flatMap(res -> Mono.from(res.getRowsUpdated()))
+                        .doOnNext(s -> LogFeed.log(LogObject.forDebug("Insert Settings: 3")))
                         .hasElement()
                         .thenReturn(true);
                 }
@@ -240,7 +241,7 @@ public class DatabaseManager {
                 return Mono.just(false);
             }).switchIfEmpty(Mono.defer(() -> {
                 LogFeed.log(LogObject.forDebug("Update Settings: Empty?????"));
-                return Mono.empty();
+                return Mono.empty(); //So we aren't breaking anything even more yet
             }));
     }