diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index 3ec18ba5070..3e3f35b287e 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -7236,7 +7236,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
 
             args += " -A ";
             args += " -l ";
-            args += pubIp;
+            args += pubIp.getPublicIp();
 
             args += " -c ";
             args += "eth" + correctVif.getDevice(conn);
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_ipassoc.sh b/patches/systemvm/debian/config/opt/cloud/bin/vpc_ipassoc.sh
index 9cd3d6dd989..d3436a2384a 100755
--- a/patches/systemvm/debian/config/opt/cloud/bin/vpc_ipassoc.sh
+++ b/patches/systemvm/debian/config/opt/cloud/bin/vpc_ipassoc.sh
@@ -150,3 +150,4 @@ then
 fi
 
 
+unlock_exit 1 $lock $locked