diff --git a/html/login/home.php b/html/login/home.php
index f3433d4..a52845d 100644
--- a/html/login/home.php
+++ b/html/login/home.php
@@ -9,7 +9,7 @@
 if (isset($_REQUEST['return_url'])) {
 	$_SESSION['return_url'] = $_REQUEST['return_url'];
 }
-require_once '/var/www/libraries/SimpleCAS/SimpleCAS/Autoload.php';
+require_once CAS.'/SimpleCAS/Autoload.php';
 
 $options = array('hostname'=>CAS_SERVER,'uri'=>CAS_URI);
 $protocol = new SimpleCAS_Protocol_Version2($options);
@@ -17,17 +17,22 @@ $client = SimpleCAS::client($protocol);
 $client->forceAuthentication();
 
 if ($client->isAuthenticated()) {
-	$user = new User($client->getUsername());
-	$user->startNewSession();
-	setcookie(CAS_COOKIE,'true',0,'/',CAS_DOMAIN);
+	try {
+		$user = new User($client->getUsername());
+		$user->startNewSession();
+		setcookie(CAS_COOKIE,'true',0,'/',CAS_DOMAIN);
 
-	if (isset($_SESSION['return_url'])) {
-		header('Location: '.$_SESSION['return_url']);
+		if (isset($_SESSION['return_url'])) {
+			header('Location: '.$_SESSION['return_url']);
+		}
+		else {
+			header('Location: '.BASE_URL);
+		}
 	}
-	else {
-		header('Location: '.BASE_URL);
+	catch (Exception $e) {
+		$_SESSION['errorMessages'][] = $e;
 	}
 }
 else {
-	echo "Could not log in";
+	header('Location: '.BASE_URL);
 }