diff --git a/dom0/qvm-core/qubes.py b/dom0/qvm-core/qubes.py
index 17f25a3b..402724b8 100755
--- a/dom0/qvm-core/qubes.py
+++ b/dom0/qvm-core/qubes.py
@@ -1422,10 +1422,14 @@ class QubesNetVm(QubesVm):
         assert lo >= 1 and lo <= 254, "Wrong IP address for VM"
         return self.dispnetprefix  + "{0}".format(lo)
 
-    def create_xenstore_entries(self, xid):
+    def create_xenstore_entries(self, xid = None):
         if dry_run:
             return
 
+        if xid is None:
+            xid = self.xid
+
+
         super(QubesNetVm, self).create_xenstore_entries(xid)
         xs.write('', "/local/domain/{0}/qubes_netvm_external_ip".format(xid), '')
         self.update_external_ip_permissions(xid)
@@ -1520,10 +1524,14 @@ class QubesProxyVm(QubesNetVm):
         self.netvm_vm.remove_external_ip_permission(self.get_xid())
         super(QubesProxyVm, self).force_shutdown()
 
-    def create_xenstore_entries(self, xid):
+    def create_xenstore_entries(self, xid = None):
         if dry_run:
             return
 
+        if xid is None:
+            xid = self.xid
+
+
         super(QubesProxyVm, self).create_xenstore_entries(xid)
         xs.write('', "/local/domain/{0}/qubes_iptables_error".format(xid), '')
         xs.set_permissions('', "/local/domain/{0}/qubes_iptables_error".format(xid),