diff --git a/src/de/steamwar/bungeecore/sql/SteamwarUser.java b/src/de/steamwar/bungeecore/sql/SteamwarUser.java
index 0956d671..67c35960 100644
--- a/src/de/steamwar/bungeecore/sql/SteamwarUser.java
+++ b/src/de/steamwar/bungeecore/sql/SteamwarUser.java
@@ -158,8 +158,9 @@ public class SteamwarUser {
         if(usersByUUID.containsKey(uuid))
             return usersByUUID.get(uuid);
         return byUUID.select(rs -> {
-            rs.next();
-            return new SteamwarUser(rs);
+            if(rs.next())
+                return new SteamwarUser(rs);
+            return null;
         }, uuid.toString());
     }