diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index 4468dbfb182..c52187b7104 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -3499,8 +3499,8 @@ public abstract class CitrixResourceBase implements ServerResource {
 
     @Override
     public PingCommand getCurrentStatus(long id) {
-        Connection conn = getConnection();
         try {
+            Connection conn = getConnection();
             if (!pingxenserver()) {
                 Thread.sleep(1000);
                 if (!pingxenserver()) {
diff --git a/core/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java b/core/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
index f069f2411da..f9cef812e14 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
@@ -412,14 +412,15 @@ public class XenServerConnectionPool {
                 // wait 2 second
                 forceSleep(2);
             }
+            throw new CloudRuntimeException("Unable to reset master of slave " + slaveIp
+                    + " to " + masterIp + "after 30 retry");
         } catch (Exception e) {
-
+            throw new CloudRuntimeException("Unable to reset master of slave " + slaveIp
+                    + " to " + masterIp + " due to " + e.toString());
         } finally {
             localLogout(slaveConn);
             slaveConn = null;
         }
-        throw new CloudRuntimeException("Unable to reset master of slave " + slaveIp
-                    + " to " + masterIp + "after 30 retry");
     }
 
     protected void ensurePoolIntegrity(Connection conn,