diff --git a/mozilla/java/webclient/build.xml b/mozilla/java/webclient/build.xml
index a8e619ebaf3..538f2887bf5 100644
--- a/mozilla/java/webclient/build.xml
+++ b/mozilla/java/webclient/build.xml
@@ -258,12 +258,10 @@ ${myenv.MOZ_JDKHOME}/bin/java ${debug.options} org.mozilla.webclient.test.Embedd
                      failonerror="yes">
       <arg line="clobber_all"/>
     </exec>
-<!--
     <exec os="Windows 2000" dir="${basedir}/src_ie" executable="make" 
                      failonerror="yes">
-      <arg line="clean"/>
+      <arg line="clobber_all"/>
     </exec>
--->
 
     <exec os="SunOS" dir="${basedir}/src_share" executable="gmake"
           failonerror="yes">
diff --git a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/test/EMWindow.java b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/test/EMWindow.java
index 5341ec4b536..383647da843 100644
--- a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/test/EMWindow.java
+++ b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/test/EMWindow.java
@@ -59,7 +59,7 @@ import java.io.FileInputStream;
  * This is a test application for using the BrowserControl.
 
  *
- * @version $Id: EMWindow.java,v 1.43 2003-05-13 20:22:07 edburns%acm.org Exp $
+ * @version $Id: EMWindow.java,v 1.44 2003-06-09 20:05:36 edburns%acm.org Exp $
  *
  * @see org.mozilla.webclient.BrowserControlFactory
 
@@ -728,11 +728,13 @@ public void eventDispatched(WebclientEvent event)
             break;
         case ((int) DocumentLoadEvent.END_DOCUMENT_LOAD_EVENT_MASK):
             stopButton.setEnabled(false);
-            backButton.setEnabled(history.canBack());
-            backMenuItem.setEnabled(history.canBack());
-            forwardButton.setEnabled(history.canForward());
-            forwardMenuItem.setEnabled(history.canForward());
-            populateHistoryMenu();
+            if (null != history) {
+                backButton.setEnabled(history.canBack());
+                backMenuItem.setEnabled(history.canBack());
+                forwardButton.setEnabled(history.canForward());
+                forwardMenuItem.setEnabled(history.canForward());
+                populateHistoryMenu();
+            }
             statusLabel.setText("Done.");
             urlStatusLabel.setText("");
             if (null != currentPage) {