diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
index ee1c4dbd..cbe88f6a 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
@@ -455,6 +455,11 @@ public class RaceViewController extends Controller {
         CompoundMark start = leg.getStartCompoundMark();
         CompoundMark end = leg.getEndCompoundMark();
 
+        //The last leg "finish" doesn't have compound marks.
+        if (start == null || end == null ) {
+            return;
+        }
+
         Shape3D start1 = view3D.getShape(start.getMark1().getSourceID()).getMesh();
         Shape3D end1 = view3D.getShape(end.getMark1().getSourceID()).getMesh();