diff --git a/src/main/java/com/Samsung/TaskTraker_Server/Repository/UserRepository.java b/src/main/java/com/Samsung/TaskTraker_Server/Repository/UserRepository.java
index 58b2420..3ba5f49 100644
--- a/src/main/java/com/Samsung/TaskTraker_Server/Repository/UserRepository.java
+++ b/src/main/java/com/Samsung/TaskTraker_Server/Repository/UserRepository.java
@@ -47,6 +47,8 @@ public class UserRepository {
         }
 
         User loadUser = DataBase.getInstance().FindUser(login);
+        if(loadUser == null)
+            return null;
         if(UserCache.size() >= MAX_COUNT_USERS_IN_CACHE)
             UserCache.remove(0);
         UserCache.add(loadUser);