diff --git a/lib/SimpleSAML/Configuration.php b/lib/SimpleSAML/Configuration.php
index 42ce14a71f33561df01e4e265fb91b20a3c70a11..2e8694d9244eca012081f908ab621fd6ec98beb9 100644
--- a/lib/SimpleSAML/Configuration.php
+++ b/lib/SimpleSAML/Configuration.php
@@ -32,10 +32,13 @@ class SimpleSAML_Configuration {
 	}
 
 	private function loadConfig() {
-		if (!file_exists($this->configpath . '/' . $this->configfilename)) {
-			echo 'You have not yet created a configuration file. [ <a href="http://rnd.feide.no/content/installing-simplesamlphp#id405868">simpleSAMLphp installation manual</a> ]';
+		$filename = $this->configpath . '/' . $this->configfilename;
+		if (!file_exists($filename)) {
+			echo '<p>You have not yet created a configuration file. [ <a href="http://rnd.feide.no/content/installing-simplesamlphp#id434777">simpleSAMLphp installation manual</a> ]</p>';
+			echo '<p>This file was missing: [' . $filename . ']</p>';
+			exit;
 		}
-		require_once($this->configpath . '/' . $this->configfilename);
+		require_once($filename);
 		$this->configuration = $config;
 	}
 
diff --git a/www/auth/login.php b/www/auth/login.php
index ccfeba53a6961faf00d8a7b5273025a77e711e9d..ecf742dba961e75a8f306184db96678a95d2534b 100644
--- a/www/auth/login.php
+++ b/www/auth/login.php
@@ -16,12 +16,10 @@ $session = SimpleSAML_Session::getInstance(true);
 
 SimpleSAML_Logger::info('AUTH  - ldap: Accessing auth endpoint login');
 
-
 SimpleSAML_Configuration::init($configdir, 'ldapconfig', 'ldap.php');
 $ldapconfig = SimpleSAML_Configuration::getInstance('ldapconfig');
 
 
-
 $error = null;
 $attributes = array();
 $username = null;