1 files changed, 8 insertions, 6 deletions
diff --git a/toolkit/profile/content/createProfileWizard.js b/toolkit/profile/content/createProfileWizard.js
index 1963f66bc4..14d006b317 100644
--- a/toolkit/profile/content/createProfileWizard.js
+++ b/toolkit/profile/content/createProfileWizard.js
@@ -96,13 +96,15 @@ function chooseProfileFolder()
   dirChooser.show();
   newProfileRoot = dirChooser.file;
 
-  // Disable the "Default Folder..." button when the default profile folder
-  // was selected manually in the File Picker.
-  document.getElementById("useDefault").disabled =
-    (newProfileRoot.parent.equals(gDefaultProfileParent));
+  if (newProfileRoot) {
+    // Disable the "Default Folder..." button when the default profile folder
+    // was selected manually in the File Picker.
+    document.getElementById("useDefault").disabled =
+      (newProfileRoot.parent.equals(gDefaultProfileParent));
 
-  gProfileRoot = newProfileRoot;
-  updateProfileDisplay();
+    gProfileRoot = newProfileRoot;
+    updateProfileDisplay();
+  }
 }
 
 // Checks the current user input for validity and triggers an error message accordingly.