diff --git a/core/classes/user.php b/core/classes/user.php
index 877a391..df6547c 100644
--- a/core/classes/user.php
+++ b/core/classes/user.php
@@ -40,7 +40,11 @@ class User {
 	    $query->bindParam(':username', $username);
         $query->execute();	
         $id = $query->fetch(PDO::FETCH_ASSOC);
+		if(isset($id['id'])) {
 		return $id['id'];
+		} else {
+		return null;
+		}
 	}
 	
 	public function getUsername() {