--- projects/cms/source/server/uk/org/iscream/cms/server/componentmanager/ReferenceManager.java	2003/02/05 16:43:46	1.19
+++ projects/cms/source/server/uk/org/iscream/cms/server/componentmanager/ReferenceManager.java	2003/07/14 16:05:54	1.20
@@ -39,8 +39,8 @@ import uk.org.iscream.cms.util.*;
  * references to all the objects it contains throughout 
  * a component.
  *
- * @author  $Author: tdb $
- * @version $Id: ReferenceManager.java,v 1.19 2003/02/05 16:43:46 tdb Exp $
+ * @author  $Author: ajm $
+ * @version $Id: ReferenceManager.java,v 1.20 2003/07/14 16:05:54 ajm Exp $
  */
 public class ReferenceManager {
 
@@ -49,7 +49,7 @@ public class ReferenceManager {
     /**
      * The current CVS revision of this class
      */
-    public final String REVISION = "$Revision: 1.19 $";
+    public final String REVISION = "$Revision: 1.20 $";
     
 //---STATIC METHODS---
 
@@ -260,6 +260,9 @@ public class ReferenceManager {
             } catch (org.omg.CORBA.ORBPackage.InvalidName e) {
                 dieWithError("\nCRITICAL:Unable to resolve reference to the Naming Service!\n" +
                                   "         Please check with your CORBA naming service provider.");
+            } catch (java.lang.NullPointerException e) {
+                dieWithError("\nCRITICAL:Unable to resolve reference to the Naming Service!\n" +
+                             "         Please check with your CORBA naming service provider.");
             }
             _ns = NamingContextExtHelper.narrow(objRef);
         }