diff --git a/src/main/java/seng302/visualiser/GameClient.java b/src/main/java/seng302/visualiser/GameClient.java
index f748f2c5..837e4145 100644
--- a/src/main/java/seng302/visualiser/GameClient.java
+++ b/src/main/java/seng302/visualiser/GameClient.java
@@ -263,20 +263,20 @@ public class GameClient {
         if (allXMLReceived()) {
             ClientYacht yacht = allBoatsMap.get(roundingData.getBoatId());
             int placing = 1;
-            int originalPlacing = yacht.getPlacing();
+//            int originalPlacing = yacht.getPlacing();
             for (ClientYacht otherYacht : allBoatsMap.values()) {
                 if (otherYacht != yacht && yacht.getLegNumber() + 1 <= otherYacht.getLegNumber()) {
                     placing++;
                 }
             }
-            if (placing != originalPlacing) {
+//            if (placing != originalPlacing) {
                 yacht.setPlacing(placing);
                 for (ClientYacht otherYacht : allBoatsMap.values()) {
                     if (otherYacht.getPlacing() < placing) {
                         otherYacht.setPlacing(otherYacht.getPlacing() + 1);
                     }
                 }
-            }
+//            }
             yacht.roundMark(
                 courseData.getCompoundMarks().get(roundingData.getMarkId()),
                 roundingData.getTimeStamp(),
diff --git a/src/main/java/seng302/visualiser/GameView.java b/src/main/java/seng302/visualiser/GameView.java
index 8861d1e5..527e8602 100644
--- a/src/main/java/seng302/visualiser/GameView.java
+++ b/src/main/java/seng302/visualiser/GameView.java
@@ -765,10 +765,11 @@ public class GameView extends Pane {
         for (Mark mark : compoundMark.getMarks()) {
             markerObjects.get(mark).showNextExitArrow();
         }
-        CompoundMark nextMark = course.get(legNumber);
-        System.out.println("nextMark = " + nextMark);
-        for (Mark mark : nextMark.getMarks()) {
-            markerObjects.get(mark).showNextEnterArrow();
+        if (legNumber < course.size()) {
+            CompoundMark nextMark = course.get(legNumber);
+            for (Mark mark : nextMark.getMarks()) {
+                markerObjects.get(mark).showNextEnterArrow();
+            }
         }
         if (legNumber - 2 >= 0) {
             CompoundMark lastMark = course.get(Math.max(0, legNumber - 2));