diff --git a/lib/SimpleSAML/Auth/Default.php b/lib/SimpleSAML/Auth/Default.php
index 8298c4ddc5ac725cbeb8879978804344f3697650..5dfa1b8f872dc7c77ae0cb9e74a59402438da6a6 100644
--- a/lib/SimpleSAML/Auth/Default.php
+++ b/lib/SimpleSAML/Auth/Default.php
@@ -15,14 +15,16 @@ class SimpleSAML_Auth_Default {
 
 
 	/**
-	 * @deprecated This method will be removed in SSP 2.0.
+	 * @deprecated This method will be removed in SSP 2.0. Use SimpleSAML_Auth_Source::initLogin() instead.
 	 */
 	public static function initLogin($authId, $return, $errorURL = NULL,
 		array $params = array()) {
 
 		$as = SimpleSAML_Auth_Source::getById($authId);
+		if ($as !== null) {
 		$as->initLogin($return, $errorURL, $params);
 	}
+	}
 
 
 	/**