diff --git a/resources/static/js/postrequest.js b/resources/static/js/postrequest.js
index 81df53f..de19042 100644
--- a/resources/static/js/postrequest.js
+++ b/resources/static/js/postrequest.js
@@ -45,31 +45,47 @@ socket.on('start', () => {
 socket.on('leaderboard', (obj) => {
     console.log(obj);
     $(".leaderboard-table").find("tr:not(:first):not(:last)").remove();
-    obj.ulysses16.forEach(element => {
-        $('#ulysses16-last').before('<tr id=""><td>' + element.name + '</td><td>' + element.fitness + '</td><td>' + element.desc + '</td></tr>')
-    });
-    obj.att48.forEach(element => {
-        $('#att48-last').before('<tr id=""><td>' + element.name + '</td><td>' + element.fitness + '</td><td>' + element.desc + '</td></tr>')
-    });
-    obj.st70.forEach(element => {
-        $('#st70-last').before('<tr id=""><td>' + element.name + '</td><td>' + element.fitness + '</td><td>' + element.desc + '</td></tr>')
-    });
-    obj.a280.forEach(element => {
-        $('#a280-last').before('<tr id=""><td>' + element.name + '</td><td>' + element.fitness + '</td><td>' + element.desc + '</td></tr>')
-    });
-    obj.pcb442.forEach(element => {
-        $('#pcb442-last').before('<tr id=""><td>' + element.name + '</td><td>' + element.fitness + '</td><td>' + element.desc + '</td></tr>')
-    });
-    obj.dsj1000.forEach(element => {
-        $('#dsj1000-last').before('<tr id=""><td>' + element.name + '</td><td>' + element.fitness + '</td><td>' + element.desc + '</td></tr>')
-    });
+    if(obj.ulysses16.length != 0) {
+        obj.ulysses16.forEach(element => {
+            $('#ulysses16-last').before('<tr id=""><td>' + element.name + '</td><td>' + element.fitness + '</td><td>' + element.desc + '</td></tr>')
+        });
+        $('#ulysses16_best').text(obj.ulysses16[0].fitness);
+    }
+    if(obj.att48.length != 0 ) {
+        obj.att48.forEach(element => {
+            $('#att48-last').before('<tr id=""><td>' + element.name + '</td><td>' + element.fitness + '</td><td>' + element.desc + '</td></tr>')
+        });
+        $('#att48_best').text(obj.att48[0].fitness);
+    }
+
+    if (obj.st70.length != 0) {
+        obj.st70.forEach(element => {
+            $('#st70-last').before('<tr id=""><td>' + element.name + '</td><td>' + element.fitness + '</td><td>' + element.desc + '</td></tr>')
+        });
+        $('#st70_best').text(obj.st70[0].fitness);
+    }
+
+    if (obj.a280.length != 0) {
+        obj.a280.forEach(element => {
+            $('#a280-last').before('<tr id=""><td>' + element.name + '</td><td>' + element.fitness + '</td><td>' + element.desc + '</td></tr>')
+        });
+        $('#a280_best').text(obj.a280[0].fitness);
+    }
+
+    if(obj.pcb442.length != 0) {
+        $('#pcb442_best').text(obj.pcb442[0].fitness);
+        obj.pcb442.forEach(element => {
+            $('#pcb442-last').before('<tr id=""><td>' + element.name + '</td><td>' + element.fitness + '</td><td>' + element.desc + '</td></tr>')
+        });
+    }
+
+    if(obj.dsj1000.length != 0) {
+        obj.dsj1000.forEach(element => {
+            $('#dsj1000-last').before('<tr id=""><td>' + element.name + '</td><td>' + element.fitness + '</td><td>' + element.desc + '</td></tr>')
+        });
+        $('#dsj1000_best').text(obj.dsj1000[0].fitness);
+    }
 
-    $('#ulysses16_best').text(obj.ulysses16[0].fitness);
-    $('#att48_best').text(obj.att48[0].fitness);
-    $('#st70_best').text(obj.st70[0].fitness);
-    $('#a280_best').text(obj.a280[0].fitness);
-    $('#pcb442_best').text(obj.pcb442[0].fitness);
-    $('#dsj1000_best').text(obj.dsj1000[0].fitness);
 });
 
 socket.on('update', (msg) => {