diff --git a/mozilla/browser/components/migration/content/migration.js b/mozilla/browser/components/migration/content/migration.js
index 42e365b801b..bba0aa021eb 100644
--- a/mozilla/browser/components/migration/content/migration.js
+++ b/mozilla/browser/components/migration/content/migration.js
@@ -71,9 +71,15 @@ var MigrationWizard = {
     var group = document.getElementById("importSourceGroup");
     for (var i = 0; i < group.childNodes.length; ++i) {
       var suffix = group.childNodes[i].id;
-      if (suffix != "nothing") {
+      if (suffix != "nothing" && suffix != "fromfile") {
         var contractID = kProfileMigratorContractIDPrefix + suffix;
-        var migrator = Components.classes[contractID].createInstance(kIMig);
+	try {
+          var migrator = Components.classes[contractID].createInstance(kIMig);
+	}
+	catch (e) {
+	  dump("*** eeee!!! contractID =" + contractID + "\n");
+	  return;
+	}
         if (!migrator.sourceExists)
           group.childNodes[i].hidden = true;
       }
diff --git a/mozilla/browser/components/migration/content/migration.xul b/mozilla/browser/components/migration/content/migration.xul
index 622fd4f6334..cbfc97494c3 100644
--- a/mozilla/browser/components/migration/content/migration.xul
+++ b/mozilla/browser/components/migration/content/migration.xul
@@ -62,7 +62,7 @@
 #endif
     <description id="importBookmarks" hidden="true">&importFromBookmarks.label;</description>
     
-    <radiogroup id="importSourceGroup">
+    <radiogroup id="importSourceGroup" align="start">
       <radio id="phoenix"   label="&importFromPhoenix.label;"   accesskey="&importFromPhoenix.accesskey;" hidden="true"/>
 #ifdef XP_UNIX
 #ifdef XP_MACOSX