diff --git a/Status.py b/Status.py
index 9e59bde..b32158f 100644
--- a/Status.py
+++ b/Status.py
@@ -116,10 +116,8 @@ def _has_passed_way_point(self):
 
     def update_target(self):
         if self._has_passed_way_point():
-            # If the boat has passed all waypoints, key is false
-            # If not, key is true
-            key = self.waypoint.next_point()
-            if not key:
+            self.waypoint.update_point()
+            if self.waypoint.has_finished():
                 print("AN has finished!")
                 self.has_finished = True
         return
diff --git a/Waypoint.py b/Waypoint.py
index c9dc41a..77cdb94 100644
--- a/Waypoint.py
+++ b/Waypoint.py
@@ -27,16 +27,24 @@ def add_point(self, latitude, longitude):
         return
 
     def get_point(self):
-        latitude = self.latitude[self._index]
-        longitude = self.longitude[self._index]
+        try:
+            latitude = self.latitude[self._index]
+            longitude = self.longitude[self._index]
+        except IndexError:
+            latitude = 0
+            longitude = 0
         return [latitude, longitude]
 
-    def next_point(self):
-        self._index += 1
-        if self._index == self._num:
-            return False
-        else:
+    def update_point(self):
+        if self._index < self._num - 1:
+            self._index += 1
+        return
+
+    def has_finished(self):
+        if self._index == self._num - 1:
             return True
+        else:
+            return False
 
 
 if __name__ == "__main__":