1 files changed, 6 insertions, 6 deletions
diff --git a/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxy.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxy.java
index 7f2bee079f..a948948d6a 100644
--- a/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxy.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxy.java
@@ -77,17 +77,17 @@ public class QpidConnectionFactoryProxy implements Externalizable, Referenceable
 
     public void writeExternal(ObjectOutput out) throws IOException
     {
-        if (_delegate == null)
-        {
-            _log.error("Null Destination ");
-            throw new IOException("Null ConnectionFactory!");
-        }
 
         try
         {
+            if(_delegate == null)
+            {
+                getReference();
+            }
+
             out.writeObject(((Referenceable) _delegate).getReference());
         }
-        catch (NamingException e)
+        catch (Exception e)
         {
             _log.error("Failed to dereference ConnectionFactory " + e.getMessage(), e);
             throw new IOException("Failed to dereference ConnectionFactory: " + e.getMessage());