diff --git a/RaceTimer/racetimer_endpoints/src/main/java/DataMapper/DataMapperCalls.java b/RaceTimer/racetimer_endpoints/src/main/java/DataMapper/DataMapperCalls.java
index 2c766022..1fce18e5 100644
--- a/RaceTimer/racetimer_endpoints/src/main/java/DataMapper/DataMapperCalls.java
+++ b/RaceTimer/racetimer_endpoints/src/main/java/DataMapper/DataMapperCalls.java
@@ -40,9 +40,9 @@ public class DataMapperCalls {
                         Player player = new Player(result.getString(1), result.getString(2));
                         //System.out.println("player dataMapper: " + player.getName() + "\nsteamid: " + player.getSteamID());
                         int i = 3;
-                        while (i < fetchSize) {
+                        while (i <= fetchSize) {
                             String specificTime = result.getString(i);
-                            if (!specificTime.equals("0.000")) {
+                            if (specificTime != null && !specificTime.equals("0.000")) {
                                 String columnLabel = result.getMetaData().getColumnLabel(i);
                                 if (!allMapBoards.keySet().contains(columnLabel)) {
                                     allMapBoards.put(columnLabel, new MapBoard(columnLabel));