diff --git a/xpinstall/wizard/unix/src2/installer.ini b/xpinstall/wizard/unix/src2/installer.ini
index c6732304928..e69de29bb2d 100644
--- a/xpinstall/wizard/unix/src2/installer.ini
+++ b/xpinstall/wizard/unix/src2/installer.ini
@@ -1,90 +0,0 @@
-
-[String Resources]
-
-;------------------------------------------------------------------------------
-;   UI strings
-;------------------------------------------------------------------------------
-
-NEXT=Next >
-BACK=< Back
-CANCEL=Cancel
-ACCEPT=Accept
-DECLINE=Decline
-INSTALL=Install
-PAUSE=Pause
-RESUME=Resume
-DEFAULT_TITLE=Mozilla Installer
-DEST_DIR=Destination Directory
-BROWSE=Change...
-SELECT_DIR=Select a directory
-DOESNT_EXIST=Directory %s doesn't exist.  Create it?
-YES_LABEL=Yes
-NO_LABEL=No
-OK_LABEL=OK
-DELETE_LABEL=Delete Directory
-CANCEL_LABEL=Cancel
-ERROR=Error [%d]: %s
-FATAL_ERROR=Fatal error [%d]: %s
-DESCRIPTION=Description
-PREPARING=Preparing %s...
-EXTRACTING=Extracting %s...
-INSTALLING_XPI=Installing %s...
-COMPLETING_INSTALL=Completing Installation...
-PROCESSING_FILE=Processing file %d of %d...
-NO_PERMS=Choose another directory because you do not have permission to install to: %s
-DL_SETTINGS=Download Settings
-SAVE_MODULES=Save installer modules upon download
-PROXY_SETTINGS=Proxy Settings...
-PS_LABEL0=Proxy Host [required]:
-PS_LABEL1=Proxy Port [required]:
-PS_LABEL2=Proxy Username [optional]:
-PS_LABEL3=Proxy Password [optional]:
-ERROR_TITLE=Error!
-DS_AVAIL=Disk Space Available = %ld KB
-DS_REQD=Disk Space Required = %ld KB
-NO_DISK_SPACE=Please select a directory on a disk with enough space to install or free some disk space on the selected disk.
-CXN_DROPPED=A network connection failure occured.  Please check your network connection and press the 'Resume' button.  Alternatively, press the 'Cancel' button to quit the installer.
-CRC_CHECK=Some files failed to download correctly. Retrying.
-DOWNLOADING=Downloading:
-FROM=From:
-TO=To:
-STATUS=Status:
-DL_STATUS_STR=%d KB  of  %d KB (at %d KB/sec)
-USAGE_MSG=Usage: %s [options]%s	[options] can be any of the following combination:%s		-h:		This help.%s		-ma:		Run setup in Auto mode: show progress UI,%s				but assume defaults without user intervention.%s		-ms:		Run setup in Silent mode: show no UI and have%s				no user intervention.%s		-ira:		Ignore the [RunAppX] sections%s
-UNKNOWN=Unknown
-
-;------------------------------------------------------------------------------
-;   Error strings
-;------------------------------------------------------------------------------
-
--601=Out of memory
--602=Invalid param
--603=Invalid member variable
--604=Invalid pointer
--605=Parse key has no value
--606=Failed to read readme
--607=Failed to read license
--608=Out of bounds in Component/Setup Type list
--609=Mismatched ref counts
--610=No components in the INI file
--611=No setup types in the INI file
--612=URL at this index already exists
--613=Couldn't create the directory
--614=FTP URL malformed
--615=Download failed
--616=Extraction of XPCOM failed
--617=Failed to fork a process
--618=Couldn't open xpistub library
--619=Couldn't get symbol in library
--620=A xpistub call failed
--621=An Installer module %s (.xpi) failed to install
--622=Copy of an installer module (.xpi) failed
--623=Destination directory doesn't exist
--624=Can't make destination directory.  Please try another directory.
--625=A previous installation exists.
--626=Insufficient permission
--627=Insufficient disk space
--628=Installation has failed due to multiple CRC failures.
--629=Usage message shown
--630=Destination directory must be empty or contain a previous installation.
--631=Invalid proxy settings
diff --git a/xpinstall/wizard/unix/src2/nsXIEngine.cpp b/xpinstall/wizard/unix/src2/nsXIEngine.cpp
index eb7d821af05..66c746dcbd1 100644
--- a/xpinstall/wizard/unix/src2/nsXIEngine.cpp
+++ b/xpinstall/wizard/unix/src2/nsXIEngine.cpp
@@ -648,7 +648,7 @@ printf("DEBUG: libpath = >>%s<<\n", libpath);
     {
         dlerr = dlerror();
         DUMP(dlerr);
-        fprintf(stderr,"DLError: %s",dlerr);
+        ErrorHandler(E_LIB_OPEN, dlerr);
         return E_LIB_OPEN;
     }
     DUMP("xpistub opened");
diff --git a/xpinstall/wizard/unix/src2/nsXInstaller.cpp b/xpinstall/wizard/unix/src2/nsXInstaller.cpp
index 6f452eb06d8..f6f05005ad9 100644
--- a/xpinstall/wizard/unix/src2/nsXInstaller.cpp
+++ b/xpinstall/wizard/unix/src2/nsXInstaller.cpp
@@ -419,21 +419,15 @@ ErrorHandler(int aErr, const char* aErrMsg)
     char errStr[16];
     
     sprintf(errStr, "%d", aErr); 
-    if (!IsErrFatal(aErr))
-    {
-	if(aErr == E_INSTALL)
-	{
-	    if (aErrMsg != NULL)
-	    {
-		sprintf(newmsg, gCtx->Res(errStr), aErrMsg);
-		sprintf(msg, gCtx->Res("ERROR"), aErr, newmsg);
-	    }
-	}
-	else
-	    sprintf(msg, gCtx->Res("ERROR"), aErr, gCtx->Res(errStr));
-    }
+    if (aErrMsg != NULL)
+       sprintf(newmsg, gCtx->Res(errStr), aErrMsg);
     else
-        sprintf(msg, gCtx->Res("FATAL_ERROR"), aErr, gCtx->Res(errStr));
+       strcpy(newmsg, gCtx->Res(errStr));
+
+    if (!IsErrFatal(aErr))
+        sprintf(msg, gCtx->Res("ERROR"), aErr, newmsg);
+    else
+        sprintf(msg, gCtx->Res("FATAL_ERROR"), aErr, newmsg);
     
     // lack of gCtx->window indicates we have not yet run RunWizard 
     // and gtk_init