From 536428ce1667c240d0d5d2b8c09236e32e5fb5d3 Mon Sep 17 00:00:00 2001
From: fjc40 <fjc40@uclive.ac.nz>
Date: Thu, 14 Sep 2017 23:11:52 +1200
Subject: [PATCH] There was a null pointer exception related to going
 into/leaving third person camera and the arrow annotation.

---
 .../main/java/visualiser/Controllers/RaceViewController.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
index 9d7376ea..fbbc7471 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
@@ -441,7 +441,10 @@ public class RaceViewController extends Controller {
 
     private void removeThirdPersonAnnotations() {
         viewSubjects.remove(nextMarkArrow);
-        arrowToNextMark.stop();
+        if (arrowToNextMark != null) {
+            arrowToNextMark.stop();
+        }
+
     }
 
     /**