Index: Naming.java =================================================================== --- Naming.java (revision 439967) +++ Naming.java (working copy) @@ -66,6 +66,9 @@ public static void bind(String name, Remote obj) throws AlreadyBoundException, MalformedURLException, RemoteException { + if (obj == null) { + throw new NullPointerException("Remote object could not be null."); + } if (name == null) { throw new NullPointerException("URL could not be null."); }