diff --git a/src/com/cyanogenmod/setupwizard/setup/WifiSetupPage.java b/src/com/cyanogenmod/setupwizard/setup/WifiSetupPage.java
index 49385b9..56beddf 100644
--- a/src/com/cyanogenmod/setupwizard/setup/WifiSetupPage.java
+++ b/src/com/cyanogenmod/setupwizard/setup/WifiSetupPage.java
@@ -170,6 +170,10 @@ public class WifiSetupPage extends SetupPage {
                 getCallbacks().onNextPage();
             }
         } else if (requestCode == SetupWizardApp.REQUEST_CODE_SETUP_CAPTIVE_PORTAL) {
+            if (data == null) {
+                launchWifiSetup();
+                return true;
+            }
             String token = data.getStringExtra("response_token");
             if (token != null && !token.equals(mResponseToken)) {
                 SetupStats.addEvent(SetupStats.Categories.EXTERNAL_PAGE_LOAD,