Index: CompoundCommandHandlerService.java
===================================================================
retrieving revision 1.5
diff -u -r1.5 CompoundCommandHandlerService.java
--- CompoundCommandHandlerService.java	10 Dec 2003 19:22:09 -0000	1.5
+++ CompoundCommandHandlerService.java	11 Dec 2003 22:12:31 -0000
@@ -103,8 +103,13 @@
 
 				if (!handlersByCommandId.containsKey(commandId))
 					handlersByCommandId.put(commandId, handler);
-				else if (!handlersByCommandId.get(commandId).equals(handler))
-					handlersByCommandId.put(commandId, null);
+				else{
+					Object cachedHandler = handlersByCommandId.get(commandId);
+					
+					if (!(cachedHandler == null || cachedHandler.equals(handler)))
+						handlersByCommandId.put(commandId, null);
+				}
+					
 			}
 		}