2 files changed, 10 insertions, 2 deletions
diff --git a/Auth/OpenID/Server.php b/Auth/OpenID/Server.php
index f390945..e43ccc4 100644
--- a/Auth/OpenID/Server.php
+++ b/Auth/OpenID/Server.php
@@ -164,7 +164,7 @@ class Auth_OpenID_ServerError {
             return $this->message->getArg(Auth_OpenID_OPENID_NS,
                                           'return_to');
         } else {
-            return false;
+            return null;
         }
     }
 
@@ -174,7 +174,7 @@ class Auth_OpenID_ServerError {
      */
     function hasReturnTo()
     {
-        return $this->getReturnTo() !== false;
+        return $this->getReturnTo() !== null;
     }
 
     /**
diff --git a/Tests/Auth/OpenID/Server.php b/Tests/Auth/OpenID/Server.php
index cab213f..152442f 100644
--- a/Tests/Auth/OpenID/Server.php
+++ b/Tests/Auth/OpenID/Server.php
@@ -180,6 +180,14 @@ class Tests_Auth_OpenID_Test_ServerError extends PHPUnit_TestCase {
         $expected = "error:waffles\nmode:error\n";
         $this->assertEquals($e->encodeToKVForm(), $expected);
     }
+
+    function test_noMessage()
+    {
+        $e = new Auth_OpenID_ServerError();
+        $this->assertFalse($e->hasReturnTo());
+        $this->assertEquals($e->whichEncoding(), null);
+        $this->assertEquals($e->getReturnTo(), null);
+    }
 }
 
 class Tests_Auth_OpenID_Test_Decode extends PHPUnit_TestCase {