diff --git a/www/admin/test.php b/www/admin/test.php
index 2ec35b98c748470474f523cf5ea81ab903cd463d..18eee7719a4bc35a277a1546aa2ae6ef3f289045 100644
--- a/www/admin/test.php
+++ b/www/admin/test.php
@@ -122,11 +122,7 @@ if ($op === 'login') {
 	}
 
 } elseif ($op === 'logout') {
-	$session = SimpleSAML_Session::getInstance(FALSE);
-
-	if ($session === NULL) {
-		error('No session.');
-	}
+	$session = SimpleSAML_Session::getInstance();
 
 	if (!$session->isValid('saml2')) {
 		error('Not logged in.');
@@ -147,8 +143,8 @@ if ($op === 'login') {
 		);
 
 } elseif ($op === 'testnosession') {
-	$session = SimpleSAML_Session::getInstance(FALSE);
-	if ($session !== NULL && $session->isValid('saml2')) {
+	$session = SimpleSAML_Session::getInstance();
+	if ($session->isValid('saml2')) {
 		error('Still logged in.');
 	}