diff --git a/ChangeLog b/ChangeLog
index 2af46c7351..e35a1ad002 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul 16 17:25:02 CEST 2008 Daniel Veillard <veillard@redhat.com>
+
+	* src/openvz_driver.c: fix the lookup by ID function and error
+	  reporting in OpenVZ, fix by Evgeniy Sokolov
+
 Wed Jul 16 16:44:27 CEST 2008 Daniel Veillard <veillard@redhat.com>
 
 	* src/openvz_driver.c: another cleanup patch from Evgeniy Sokolov
diff --git a/src/openvz_driver.c b/src/openvz_driver.c
index 8229697176..d1aa87b8ea 100644
--- a/src/openvz_driver.c
+++ b/src/openvz_driver.c
@@ -197,11 +197,22 @@ static int openvzDomainDefineCmd(virConnectPtr conn,
 static virDomainPtr openvzDomainLookupByID(virConnectPtr conn,
                                    int id) {
     struct openvz_driver *driver = (struct openvz_driver *)conn->privateData;
-    struct openvz_vm *vm = openvzFindVMByID(driver, id);
+    struct openvz_vm *vm;
     virDomainPtr dom;
 
+    vm = openvzFindVMByID(driver, id);
+
+    if (!vm) { /*try to find by name*/
+        char name[OPENVZ_NAME_MAX];
+        if (snprintf(name, OPENVZ_NAME_MAX, "%d",id) >= OPENVZ_NAME_MAX) {
+            openvzError(conn, VIR_ERR_INTERNAL_ERROR, _("Too long domain name"));
+            return NULL;
+        }
+        vm = openvzFindVMByName(driver, name);
+    }
+
     if (!vm) {
-        openvzError(conn, VIR_ERR_INTERNAL_ERROR, _("no domain with matching id"));
+        openvzError(conn, VIR_ERR_NO_DOMAIN, NULL);
         return NULL;
     }
 
@@ -229,7 +240,7 @@ static virDomainPtr openvzDomainLookupByUUID(virConnectPtr conn,
     virDomainPtr dom;
 
     if (!vm) {
-        openvzError(conn, VIR_ERR_INVALID_DOMAIN, _("no domain with matching uuid"));
+        openvzError(conn, VIR_ERR_NO_DOMAIN, NULL);
         return NULL;
     }
 
@@ -250,7 +261,7 @@ static virDomainPtr openvzDomainLookupByName(virConnectPtr conn,
     virDomainPtr dom;
 
     if (!vm) {
-        openvzError(conn, VIR_ERR_INTERNAL_ERROR, _("no domain with matching name"));
+        openvzError(conn, VIR_ERR_NO_DOMAIN, NULL);
         return NULL;
     }