diff --git a/mozilla/toolkit/profile/content/createProfileWizard.js b/mozilla/toolkit/profile/content/createProfileWizard.js
index 2f397a2f391..73b21f9fe2b 100644
--- a/mozilla/toolkit/profile/content/createProfileWizard.js
+++ b/mozilla/toolkit/profile/content/createProfileWizard.js
@@ -92,18 +92,12 @@ function chooseProfileFolder()
 {
   var newProfileRoot;
   
-  try {
-    var dirChooser = C["@mozilla.org/filepicker;1"].createInstance(I.nsIFilePicker);
-    dirChooser.init(window, gProfileManagerBundle.getString("chooseFolder"),
-                    I.nsIFilePicker.modeGetFolder);
-    dirChooser.appendFilters(I.nsIFilePicker.filterAll);
-    dirChooser.show();
-    newProfileRoot = dirChooser.file;
-  }
-  catch(e) {
-    // If something fails, change nothing.
-    return;
-  }
+  var dirChooser = C["@mozilla.org/filepicker;1"].createInstance(I.nsIFilePicker);
+  dirChooser.init(window, gProfileManagerBundle.getString("chooseFolder"),
+                  I.nsIFilePicker.modeGetFolder);
+  dirChooser.appendFilters(I.nsIFilePicker.filterAll);
+  dirChooser.show();
+  newProfileRoot = dirChooser.file;
 
   // Disable the "Default Folder..." button when the default profile folder
   // was selected manually in the File Picker.
diff --git a/mozilla/toolkit/profile/locale/profileSelection.properties b/mozilla/toolkit/profile/locale/profileSelection.properties
index a58f5dac972..c6cb7fda07f 100644
--- a/mozilla/toolkit/profile/locale/profileSelection.properties
+++ b/mozilla/toolkit/profile/locale/profileSelection.properties
@@ -14,6 +14,10 @@ renameProfilePrompt=Rename the profile "%S" to:
 profileNameInvalidTitle=Invalid profile name
 profileNameInvalid=The profile name "%S" is not allowed.
 
+chooseFolder=Choose Profile Folder
+profileNameEmpty=An empty profile name is not allowed.
+invalidChar=The character "%S" is not allowed in profile names. Please choose a different name.
+
 deleteTitle=Delete Profile
 deleteProfile=Deleting a profile will remove the profile from the list of available profiles and cannot be undone.\nYou may also choose to delete the profile data files, including your saved mail, settings, and certificates. This option will delete the folder "%S" and cannot be undone.\nWould you like to delete the profile data files?
 deleteFiles=Delete Files