diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
index 3af5eeafcfd6dd90ab8c4c1eaf0c95ee300cc39b..96cad99e4e6af1a8aa89cfd2c9392e04b55e15f2 100644
--- a/src/xenapi/xenapi_driver.c
+++ b/src/xenapi/xenapi_driver.c
@@ -156,22 +156,14 @@ xenapiConnectOpen(virConnectPtr conn, virConnectAuthPtr auth,
         if (VIR_STRDUP(username, conn->uri->user) < 0)
             goto error;
     } else {
-        username = virAuthGetUsername(conn, auth, "xen", NULL, conn->uri->server);
-
-        if (username == NULL) {
-            xenapiSessionErrorHandler(conn, VIR_ERR_AUTH_FAILED,
-                                      _("Username request failed"));
+        if (!(username = virAuthGetUsername(conn, auth, "xen", NULL,
+                                            conn->uri->server)))
             goto error;
-        }
     }
 
-    password = virAuthGetPassword(conn, auth, "xen", username, conn->uri->server);
-
-    if (password == NULL) {
-        xenapiSessionErrorHandler(conn, VIR_ERR_AUTH_FAILED,
-                                  _("Password request failed"));
+    if (!(password = virAuthGetPassword(conn, auth, "xen", username,
+                                        conn->uri->server)))
         goto error;
-    }
 
     if (VIR_ALLOC(privP) < 0)
         goto error;