diff --git a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/EventRegistrationImpl.java b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/EventRegistrationImpl.java
index a9f7b2d7a79..8fc58ee0837 100644
--- a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/EventRegistrationImpl.java
+++ b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/EventRegistrationImpl.java
@@ -444,7 +444,12 @@ private EventObject createKeyEvent(long eventType, Object eventData) {
 	    }
 	}
 	if (null != (str = props.getProperty("KeyCode"))) {
-	    keyCode = Integer.valueOf(str).intValue();
+	    if (0 == str.length() || KeyEvent.KEY_TYPED == eventType) {
+		keyCode = KeyEvent.VK_UNDEFINED;
+	    }
+	    else {
+		keyCode = Integer.valueOf(str).intValue();
+	    }
 	}
 	if (null != (str = props.getProperty("KeyChar"))) {
 	    if (0 == str.length()) {
@@ -458,7 +463,6 @@ private EventObject createKeyEvent(long eventType, Object eventData) {
 
     long when = System.currentTimeMillis();
     if (KeyEvent.KEY_TYPED == eventType) {
-	keyCode = KeyEvent.VK_UNDEFINED;
 	// swalow events where the event is KEY_TYPED, but the keyChar
 	// is undefined, since these would throw an
 	// IllegalArgumentException.
@@ -466,8 +470,17 @@ private EventObject createKeyEvent(long eventType, Object eventData) {
 	    return null;
 	}
     }
-    keyEvent = new KeyEvent((Component) browserControlCanvas, (int) eventType,
-			    when, modifiers, keyCode, keyChar);
+    try {
+	keyEvent = new KeyEvent((Component) browserControlCanvas, (int) eventType,
+				when, modifiers, keyCode, keyChar);
+    }
+    catch (Throwable e) {
+	String msg = e.getMessage();
+	System.out.println(e.toString() + " " + e.getMessage() + 
+			   " eventType: " + eventType + 
+			   " keyCode: " + keyCode +
+			   " keyChar: " + keyChar);
+    }
 
     WebclientEvent event = new WebclientEvent(browserControlCanvas, eventType,
 					      keyEvent);
diff --git a/mozilla/java/webclient/src_moz/EmbedEventListener.cpp b/mozilla/java/webclient/src_moz/EmbedEventListener.cpp
index dbf43cd7cd7..8426b307a2d 100644
--- a/mozilla/java/webclient/src_moz/EmbedEventListener.cpp
+++ b/mozilla/java/webclient/src_moz/EmbedEventListener.cpp
@@ -494,9 +494,7 @@ nsresult EmbedEventListener::addKeyEventDataToProperties(nsCOMPtr<nsIDOMKeyEvent
 
     // Add modifiers, keys, etc, to the mProperties table
 
-    PRInt32 intVal;
     PRUint32 int32Val;
-    PRUint16 int16Val;
     PRBool boolVal;
     char buf[20];
     jstring strVal;
diff --git a/mozilla/java/webclient/src_moz/NavigationImpl.cpp b/mozilla/java/webclient/src_moz/NavigationImpl.cpp
index 953665e4697..6ac6be6ae9f 100644
--- a/mozilla/java/webclient/src_moz/NavigationImpl.cpp
+++ b/mozilla/java/webclient/src_moz/NavigationImpl.cpp
@@ -30,7 +30,9 @@
 
 #include "org_mozilla_webclient_impl_wrapper_0005fnative_NavigationImpl.h"
 
-#include "nsServiceManagerUtils.h"
+#include "nsIServiceManagerUtils.h" // PENDING(edburns): when moving
+                                    // past 1.7, this changes to
+                                    // nsServiceManagerUtils.h
 #include "nsIIOService.h"
 #include "nsIURI.h"
 #include "nsString.h"
diff --git a/mozilla/java/webclient/src_share/jni_util.cpp b/mozilla/java/webclient/src_share/jni_util.cpp
index be9960aee9c..a6c703e8544 100644
--- a/mozilla/java/webclient/src_share/jni_util.cpp
+++ b/mozilla/java/webclient/src_share/jni_util.cpp
@@ -165,12 +165,12 @@ jboolean util_InitStringConstants()
     }
     if (nsnull == (CHAR_CODE = 
                    ::util_NewGlobalRef(env, (jobject)
-                                       ::util_NewStringUTF(env, "KeyCode")))) {
+                                       ::util_NewStringUTF(env, "KeyChar")))) {
         return JNI_FALSE;
     }
     if (nsnull == (KEY_CODE = 
                    ::util_NewGlobalRef(env, (jobject)
-                                       ::util_NewStringUTF(env, "KeyChar")))) {
+                                       ::util_NewStringUTF(env, "KeyCode")))) {
         return JNI_FALSE;
     }
     if (nsnull == (ALT_KEY = 
diff --git a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/KeyListenerTest.java b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/KeyListenerTest.java
index c059928675f..08f0a4e6d8b 100644
--- a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/KeyListenerTest.java
+++ b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/KeyListenerTest.java
@@ -1,5 +1,5 @@
 /*
- * $Id: KeyListenerTest.java,v 1.1 2004-12-01 03:21:23 edburns%acm.org Exp $
+ * $Id: KeyListenerTest.java,v 1.2 2004-12-01 15:46:23 edburns%acm.org Exp $
  */
 
 /* 
@@ -119,6 +119,19 @@ public class KeyListenerTest extends WebclientTestCase {
 		}
 	    });
 	final BitSet bitSet = new BitSet();
+
+	KeyListener manualExitKeyListener = new KeyListener() {
+		public void keyPressed(KeyEvent e) {
+		}
+		public void keyReleased(KeyEvent e) {
+		}
+		public void keyTyped(KeyEvent e) {
+		    if ('z' == e.getKeyChar()) {
+			KeyListenerTest.keepWaiting = false;
+		    }
+		}
+	    };
+	canvas.addKeyListener(manualExitKeyListener);
 	
 	KeyListener keyListener = new KeyListener() {
 		public void keyPressed(KeyEvent e) {
@@ -158,6 +171,17 @@ public class KeyListenerTest extends WebclientTestCase {
 	robot.mousePress(InputEvent.BUTTON1_MASK);
 	robot.mouseRelease(InputEvent.BUTTON1_MASK);
 
+
+	// uncomment to enable manual testing
+	/*************
+	KeyListenerTest.keepWaiting = true;
+	
+	// keep waiting until the previous load completes
+	while (KeyListenerTest.keepWaiting) {
+	    Thread.currentThread().sleep(1000);
+	}
+	******************/
+
 	robot.keyPress(KeyEvent.VK_A);
 	robot.keyRelease(KeyEvent.VK_A);