diff --git a/Auth/OpenID/Discover.php b/Auth/OpenID/Discover.php
index 34bdae5..efd4a74 100644
--- a/Auth/OpenID/Discover.php
+++ b/Auth/OpenID/Discover.php
@@ -496,7 +496,7 @@ function Auth_OpenID_discoverWithYadis($uri, &$fetcher,
     $yadis_url = $response->normalized_uri;
     $yadis_services = array();
 
-    if ($response->isFailure()) {
+    if ($response->isFailure() && !$response->isXRDS()) {
         return array($uri, array());
     }
 
diff --git a/Auth/Yadis/Yadis.php b/Auth/Yadis/Yadis.php
index 43cd25d..6b87c0f 100644
--- a/Auth/Yadis/Yadis.php
+++ b/Auth/Yadis/Yadis.php
@@ -105,7 +105,7 @@ function services()
     function usedYadisLocation()
     {
         // Was the Yadis protocol's indirection used?
-        return $this->normalized_uri != $this->xrds_uri;
+        return ($this->xrds_uri && $this->normalized_uri != $this->xrds_uri);
     }
 
     function isXRDS()