diff --git a/ChangeLog b/ChangeLog
index f69496d329db1125882a0437062ac646e8dbc073..1ef240a358e682c08aa5d897ef671960a25c4843 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May  1 14:10:28 EST 2008 Daniel P. Berrange <berrange@redhat.com>
+
+	* src/remote_internal.c: Cope with NULL from qparam_get_query
+	by removing unncessary check. (Dave Leskovec)
+
 Tue Apr 29 12:32:28 EST 2008 Daniel P. Berrange <berrange@redhat.com>
 
 	* configure.in: Remove compatability macros AC_CHECK_*_ONCE for
diff --git a/src/remote_internal.c b/src/remote_internal.c
index 70aa5e9065b8561f3fa846fdc5013932a6b42ea3..f3bef3d39ef46ec0743e77787ed5e7267fdb92ae 100644
--- a/src/remote_internal.c
+++ b/src/remote_internal.c
@@ -439,13 +439,12 @@ doRemoteOpen (virConnectPtr conn,
     xmlFree (uri->query);
 #endif
 
-    if ((
 #ifdef HAVE_XMLURI_QUERY_RAW
-         uri->query_raw =
+    uri->query_raw =
 #else
-         uri->query =
+    uri->query =
 #endif
-         qparam_get_query (vars)) == NULL) goto failed;
+         qparam_get_query (vars);
 
     free_qparam_set (vars);