diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
new file mode 100644
index 00000000..5352bdf8
--- /dev/null
+++ b/.idea/codeStyleSettings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectCodeStyleSettingsManager">
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/racevisionGame/src/main/java/visualiser/model/VisualiserRace.java b/racevisionGame/src/main/java/visualiser/model/VisualiserRace.java
index 3a76631d..0cde70af 100644
--- a/racevisionGame/src/main/java/visualiser/model/VisualiserRace.java
+++ b/racevisionGame/src/main/java/visualiser/model/VisualiserRace.java
@@ -307,18 +307,19 @@ public class VisualiserRace extends Race {
      * @param raceStatus The RaceStatus message received.
      */
     private void updateRaceStatus(RaceStatus raceStatus) {
+        if (raceStatus != null) {
+            //Race status enum.
+            this.raceStatusEnum = RaceStatusEnum.fromByte(raceStatus.getRaceStatus());
 
-        //Race status enum.
-        this.raceStatusEnum = RaceStatusEnum.fromByte(raceStatus.getRaceStatus());
+            //Wind bearing.
+            this.windDirection.setDegrees(raceStatus.getScaledWindDirection());
 
-        //Wind bearing.
-        this.windDirection.setDegrees(raceStatus.getScaledWindDirection());
+            //Wind speed.
+            this.windSpeed = raceStatus.getWindSpeedKnots();
 
-        //Wind speed.
-        this.windSpeed = raceStatus.getWindSpeedKnots();
-
-        //Current race time.
-        this.raceClock.setUTCTime(raceStatus.getCurrentTime());
+            //Current race time.
+            this.raceClock.setUTCTime(raceStatus.getCurrentTime());
+        }
 
     }