diff --git a/www/auth/login-admin.php b/www/auth/login-admin.php
index 2fd513e112279c69b6f0879cb8e2db277ea2532b..88471aa475992a325e818b6bc7f2e2bd689dbdf7 100644
--- a/www/auth/login-admin.php
+++ b/www/auth/login-admin.php
@@ -19,6 +19,8 @@ $error = null;
 $attributes = array();
 $username = null;
 
+if (empty($session))
+	SimpleSAML_Utilities::fatalError($session->getTrackID(), 'NOSESSION');
 
 /* Load the RelayState argument. The RelayState argument contains the address
  * we should redirect the user to after a successful authentication.
diff --git a/www/auth/login-feide.php b/www/auth/login-feide.php
index 59b4b67d9ed301f3adb1cc40bee55404b619ab21..b556fa8671a8c87f55a00d01cc95402715dff911 100644
--- a/www/auth/login-feide.php
+++ b/www/auth/login-feide.php
@@ -40,6 +40,11 @@ SimpleSAML_Logger::info('AUTH - ldap-feide: Accessing auth endpoint login-feide'
 $error = null;
 $attributes = array();
 
+
+if (empty($session))
+	SimpleSAML_Utilities::fatalError($session->getTrackID(), 'NOSESSION');
+
+
 /*
  * Load the RelayState argument. The RelayState argument contains the address
  * we should redirect the user to after a successful authentication.
diff --git a/www/auth/login-ldapmulti.php b/www/auth/login-ldapmulti.php
index ee33b89262812ec0ea78931cd8bbe66a4d15f6ed..65189cd2412d9000ff5a79af931396bcc149684c 100644
--- a/www/auth/login-ldapmulti.php
+++ b/www/auth/login-ldapmulti.php
@@ -19,6 +19,8 @@ require_once($ldapconfigfile);
 
 SimpleSAML_Logger::info('AUTH - ldap-multi: Accessing auth endpoint login-ldapmulti');
 
+if (empty($session))
+	SimpleSAML_Utilities::fatalError($session->getTrackID(), 'NOSESSION');
 
 $error = null;
 $attributes = array();
diff --git a/www/auth/login-radius.php b/www/auth/login-radius.php
index a87eb542aca4541a150abc86ff6cf9197cdae1d4..3aadf28e5503d8d6782a52ea65496ed4b47be399 100644
--- a/www/auth/login-radius.php
+++ b/www/auth/login-radius.php
@@ -18,6 +18,9 @@ SimpleSAML_Logger::info('AUTH - radius: Accessing auth endpoint login');
 $error = null;
 $attributes = array();
 
+if (empty($session))
+	SimpleSAML_Utilities::fatalError($session->getTrackID(), 'NOSESSION');
+
 /* Load the RelayState argument. The RelayState argument contains the address
  * we should redirect the user to after a successful authentication.
  */
diff --git a/www/auth/login.php b/www/auth/login.php
index ea5b4e5796ad8fcefda8f2bbfb2fdb4ac8ea7fda..69a50992e7e0157fc37a02774503285c359cb23c 100644
--- a/www/auth/login.php
+++ b/www/auth/login.php
@@ -21,6 +21,8 @@ $error = null;
 $attributes = array();
 $username = null;
 
+if (empty($session))
+	SimpleSAML_Utilities::fatalError($session->getTrackID(), 'NOSESSION');
 
 /* Load the RelayState argument. The RelayState argument contains the address
  * we should redirect the user to after a successful authentication.