diff --git a/src/main/java/com/revature/services/EmployeeServiceImpl.java b/src/main/java/com/revature/services/EmployeeServiceImpl.java
index d125591..33e0054 100644
--- a/src/main/java/com/revature/services/EmployeeServiceImpl.java
+++ b/src/main/java/com/revature/services/EmployeeServiceImpl.java
@@ -88,11 +88,13 @@ public List<Employee> getActiveDrivers() {
 	@Override
 	public Employee loginEmployee(String username, String password) {
 		Employee e = er.findByUsername(username);
-		if (e.getPassword().equals(password)) {
+		if (e == null) {
+			return null;
+		}
+		else if (e.getPassword().equals(password)) {
 			return e;
 		}
-		else return null;
-		
+		return null;
 //		StrongPasswordEncryptor passwordEncryptor = new StrongPasswordEncryptor();
 		
 //		if (passwordEncryptor.checkPassword(password, e.getPassword())) {