diff --git a/src/main/java/seng202/group9/Core/FlightPoint.java b/src/main/java/seng202/group9/Core/FlightPoint.java
index ebe252b..c45e37a 100644
--- a/src/main/java/seng202/group9/Core/FlightPoint.java
+++ b/src/main/java/seng202/group9/Core/FlightPoint.java
@@ -197,7 +197,10 @@ public class FlightPoint {
 	 * gets the Path Index ID at this point.
 	 * @return
 	 */
-	public int getIndex(){
+	public int getIndex() throws DataException{
+		if (indexID == -1){
+			throw new DataException("Index ID is not set.");
+		}
 		return indexID;
 	}
 
diff --git a/src/main/java/seng202/group9/GUI/FlightRDController.java b/src/main/java/seng202/group9/GUI/FlightRDController.java
index 223c675..b1e11af 100644
--- a/src/main/java/seng202/group9/GUI/FlightRDController.java
+++ b/src/main/java/seng202/group9/GUI/FlightRDController.java
@@ -204,7 +204,14 @@ public class FlightRDController extends Controller {
      */
     public void deletePoint() {
         FlightPoint toDelete = flightTableView.getSelectionModel().getSelectedItem();
-        int pathID = toDelete.getIndex();
+        int pathID = 0;
+        try {
+            pathID = toDelete.getIndex();
+        } catch (DataException e) {
+            e.printStackTrace();
+            System.out.println("Point is Undeletable as the Index ID is not set.");
+            return;
+        }
         LinkedHashMap<Integer, FlightPath> flightPathDict = theDataSet.getFlightPathDictionary();
         FlightPath toDeletesPath = flightPathDict.get(pathID);
         theDataSet.deleteFlightPoint(toDelete, toDeletesPath);
diff --git a/src/test/java/seng202/group9/FlightPointTest.java b/src/test/java/seng202/group9/FlightPointTest.java
new file mode 100644
index 0000000..c68d891
--- /dev/null
+++ b/src/test/java/seng202/group9/FlightPointTest.java
@@ -0,0 +1,82 @@
+package seng202.group9;/**
+ * Created by Gondr on 19/09/2016.
+ */
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+import seng202.group9.Controller.DataException;
+import seng202.group9.Core.FlightPoint;
+
+public class FlightPointTest {
+
+    @Test
+    public void testConstructor(){
+        FlightPoint startPoint = new FlightPoint("NZCH", 1, 1, "APT", "", 0, 0, 0, 0, 172.5336822, -43.48664019);
+
+        try {
+            assertTrue(startPoint.getID() == 1);
+            assertTrue(startPoint.getIndexID() == 1);
+        } catch (DataException e) {
+            fail("The Initial ID is set for this class");
+        }
+        assertEquals(startPoint.getName(), "NZCH");
+        assertEquals(startPoint.getType(), "APT");
+        assertEquals(startPoint.getVia(), "");
+        assertTrue(startPoint.getHeading() == 0);
+        assertTrue(startPoint.getLegDistance() == 0);
+        assertTrue(startPoint.getAltitude() == 0);
+        assertTrue(startPoint.getTotalDistance() == 0);
+        assertTrue(startPoint.getLatitude() == 172.5336822);
+        assertTrue(startPoint.getLongitude() == -43.48664019);
+
+        startPoint.setName("NZAK");
+        startPoint.setType("FIX");
+        startPoint.setID(2);
+        startPoint.setIndexID(2);
+        startPoint.setVia("SIN");
+        startPoint.setHeading(15);
+        startPoint.setLegDistance(95.4);
+        startPoint.setAltitude(0.5);
+        startPoint.setTotalDistance(540.8);
+        startPoint.setLatitude(172.5);
+        startPoint.setLongitude(-43.5);
+
+        try {
+            assertTrue(startPoint.getID() == 2);
+            assertTrue(startPoint.getIndexID() == 2);
+        } catch (DataException e) {
+            fail("The Initial ID is set for this class");
+        }
+        assertEquals(startPoint.getName(), "NZAK");
+        assertEquals(startPoint.getType(), "FIX");
+        assertEquals(startPoint.getVia(), "SIN");
+        assertTrue(startPoint.getHeading() == 15);
+        assertTrue(startPoint.getLegDistance() == 95.4);
+        assertTrue(startPoint.getAltitude() == 0.5);
+        assertTrue(startPoint.getTotalDistance() == 540.8);
+        assertTrue(startPoint.getLatitude() == 172.5);
+        assertTrue(startPoint.getLongitude() == -43.5);
+
+    }
+
+    @Test (expected = DataException.class)
+    public void checkIDFail() throws  DataException{
+        FlightPoint endPoint = new FlightPoint("APT", "WSSS", 0, 103.995603, 1.35191714);
+        endPoint.getID();
+    }
+
+    @Test (expected = DataException.class)
+    public void checkIndexIDFail() throws  DataException{
+        FlightPoint endPoint = new FlightPoint("APT", "WSSS", 0, 103.995603, 1.35191714);
+        endPoint.getIndexID();
+    }
+
+
+    @Test (expected = DataException.class)
+    public void checkIndexFail() throws  DataException{
+        FlightPoint endPoint = new FlightPoint("APT", "WSSS", 0, 103.995603, 1.35191714);
+        endPoint.getIndex();
+    }
+
+}
\ No newline at end of file