diff --git a/WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift b/WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift
index 235958803ebe..aaf35781a9b4 100644
--- a/WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift
+++ b/WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift
@@ -451,10 +451,11 @@ extension LoginEmailViewController {
 }
 
 extension LoginEmailViewController: GIDSignInDelegate {
-    func sign(_ signIn: GIDSignIn!, didSignInFor user: GIDGoogleUser!, withError error: Error!) {
+    func sign(_ signIn: GIDSignIn?, didSignInFor user: GIDGoogleUser?, withError error: Error?) {
         // TODO: finish implementing wpcom login via Google code
-        guard let token = user.authentication.idToken,
-                let email = user.profile.email else {
+        guard let user = user,
+              let token = user.authentication.idToken,
+              let email = user.profile.email else {
             // The Google SignIn for may have been canceled.
             //TODO: Add analytis
             return