diff --git a/cloudcontrol/node/hypervisor/__init__.py b/cloudcontrol/node/hypervisor/__init__.py
index c53b688bf876ec69965065def8196ede4231804f..d30b9b068617d703d060601778f0a7c637047c5e 100644
--- a/cloudcontrol/node/hypervisor/__init__.py
+++ b/cloudcontrol/node/hypervisor/__init__.py
@@ -199,10 +199,11 @@ class Handler(HostHandler):
     @libvirt_handler
     def vm_define(self, data, format='xml'):
         logger.debug('VM define')
-        if format != 'xml':
-            raise NotImplementedError('Format not supported')
 
-        return self.hypervisor.vm_define(data)
+        if format == 'xml':
+            return self.hypervisor.vm_define(data)
+        else:
+            raise NotImplementedError('Format not supported')
 
     @libvirt_handler
     def vm_undefine(self, name):
diff --git a/cloudcontrol/node/hypervisor/kvm.py b/cloudcontrol/node/hypervisor/kvm.py
index e6e83b852ebd245f1c623b1780fa0c4b5e80f2e0..002a22a26a1fed558f907e769adeeef36b5dbf96 100644
--- a/cloudcontrol/node/hypervisor/kvm.py
+++ b/cloudcontrol/node/hypervisor/kvm.py
@@ -210,7 +210,7 @@ class KVM(object):
         :return: VM name created
         """
         try:
-            return self.vir_con.defineXML(xml_desc).name()
+            return self.vir_con.defineXML(xml_desc).UUIDString()
         except libvirt.libvirtError:
             logger.exception('Error while creating domain')
             # reraise exception for the cc-server