diff --git a/dictionaries/errors.php b/dictionaries/errors.php
index 12de1177d3535defefd3b43c4b7012f0f9491590..f4a5b6f6fde479d19215025a43defaa79484784d 100644
--- a/dictionaries/errors.php
+++ b/dictionaries/errors.php
@@ -632,4 +632,13 @@ $lang = array(
 		'es' => 'La clave de acceso del fichero de configuraciĂłn (auth.adminpassword) no ha sido cambiada de su valor por defecto. Por favor, edite dicho fichero'
 	),
 
+	'title_LOGOUTINFOLOST' => array(
+		'en' => 'Logout information lost',
+		'no' => 'Informasjon om utlogging er tapt',
+	),
+	'descr_LOGOUTINFOLOST' => array(
+		'en' => 'The information about the current logout operation has been lost. You should return to the service you were trying to log out from and try to log out again. This error can be caused by the logout information expiring. The logout information is stored for a limited amout of time - usually a number of hours. This is longer than any normal logout operation should take, so this error may indicate some other error with the configuration. If the problem persists, contact your service provider.',
+		'no' => 'Informasjonen om den nåværende utloggingen har gått tapt. Du bør gå tilbake til den opprinnelige tjesesten og prøve å logge ut på nytt. Informasjon om utloggingsoperasjoner er kun lagret i en begrenset tid - vanligvis noen timer. Dette er lengere tid enn en vanlig utlogging skal ta, så denne feilen kan tyde på at noe er galt med oppsettet. Ta kontakt med tjenesteyteren hvis problemet gjentar seg.',
+	),
+
 );
\ No newline at end of file
diff --git a/www/saml2/idp/SingleLogoutService.php b/www/saml2/idp/SingleLogoutService.php
index 77d0d46f0409cd1e1c8af6c96ee8ba9955225712..72c270726359686e87039cf3a6708297a504f9b5 100644
--- a/www/saml2/idp/SingleLogoutService.php
+++ b/www/saml2/idp/SingleLogoutService.php
@@ -319,7 +319,7 @@ if ($session->getAuthority() == 'shib13') {
 try {
 
 	if(!$logoutInfo) {
-		throw new Exception('The logout information has been lost during logout processing.');
+		SimpleSAML_Utilities::fatalError($session->getTrackID(), 'LOGOUTINFOLOST');
 	}
 	
 	SimpleSAML_Logger::debug('SAML2.0 - IdP.SingleLogoutService: Found logout info with these keys: ' . join(',', array_keys($logoutInfo)));
diff --git a/www/saml2/sp/SingleLogoutService.php b/www/saml2/sp/SingleLogoutService.php
index a56371c440e7f518499024f9414c2d8ae1750a4d..d5ac61084a6f63823f7d216e08438ade67394ab4 100644
--- a/www/saml2/sp/SingleLogoutService.php
+++ b/www/saml2/sp/SingleLogoutService.php
@@ -110,7 +110,7 @@ if (isset($_GET['SAMLRequest'])) {
 	$returnTo = $session->getData('spLogoutReturnTo', $id);
 
 	if(empty($returnTo)) {
-		SimpleSAML_Utilities::fatalError($session->getTrackID(), 'NORELAYSTATE');
+		SimpleSAML_Utilities::fatalError($session->getTrackID(), 'LOGOUTINFOLOST');
 	}
 
 	SimpleSAML_Utilities::redirect($returnTo);