diff --git a/Xamarin.Essentials/WebAuthenticator/WebAuthenticatorIntermediateActivity.android.cs b/Xamarin.Essentials/WebAuthenticator/WebAuthenticatorIntermediateActivity.android.cs
index 7c197dc7d..03a348a1c 100644
--- a/Xamarin.Essentials/WebAuthenticator/WebAuthenticatorIntermediateActivity.android.cs
+++ b/Xamarin.Essentials/WebAuthenticator/WebAuthenticatorIntermediateActivity.android.cs
@@ -21,15 +21,15 @@ protected override void OnCreate(Bundle savedInstanceState)
             var extras = savedInstanceState ?? Intent.Extras;
 
             // read the values
-            launched = extras.GetBoolean(launchedExtra, false);
-            actualIntent = extras.GetParcelable(actualIntentExtra) as Intent;
+            launched = extras?.GetBoolean(launchedExtra, false) ?? false;
+            actualIntent = extras?.GetParcelable(actualIntentExtra) as Intent;
         }
 
         protected override void OnResume()
         {
             base.OnResume();
 
-            if (!launched)
+            if (actualIntent != null && !launched)
             {
                 // if this is the first time, start the authentication flow
                 StartActivity(actualIntent);