diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index c796998a..726f66db 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -4,6 +4,8 @@ import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
+import javafx.scene.control.Alert;
+import javafx.scene.control.Alert.AlertType;
 import javafx.stage.Stage;
 import seng302.models.PolarTable;
 import seng302.models.stream.StreamParser;
@@ -32,45 +34,56 @@ public class App extends Application {
     }
 
     public static void main(String[] args) {
-        StreamReceiver sr = null;
-
-        new ServerThread("Racevision Test Server");
-
         try {
+
+          StreamReceiver sr = null;
+
+          new ServerThread("Racevision Test Server");
+
+          try {
             Thread.sleep(2000);
-        } catch (InterruptedException e) {
+          } catch (InterruptedException e) {
             e.printStackTrace();
-        }
+          }
 
-        if (args.length == 1 && args[0].equals("-standalone")) {
+          if (args.length == 1 && args[0].equals("-standalone")) {
             return;
-        }
+          }
 
-        if (args.length == 3 && args[0].equals("-server")) {
+          if (args.length == 3 && args[0].equals("-server")) {
 
             sr = new StreamReceiver(args[1], Integer.valueOf(args[2]), "RaceStream");
 
-        } else if (args.length == 2 && args[0].equals("-server")) {
+          } else if (args.length == 2 && args[0].equals("-server")) {
             switch (args[1]) {
-                case "internal":
-                    sr = new StreamReceiver("localhost", 4949, "RaceStream");
-                    break;
-                case "staffserver":
-                    sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4941, "RaceStream");
-                    break;
-                case "official":
-                    sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
-                    break;
+              case "internal":
+                sr = new StreamReceiver("localhost", 4949, "RaceStream");
+                break;
+              case "staffserver":
+                sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4941, "RaceStream");
+                break;
+              case "official":
+                sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
+                break;
             }
-        }
-        //Change the StreamReceiver in this else block to change the default data source.
-        else{
-            sr = new StreamReceiver("localhost", 4949, "RaceStream");
-        }
+          }
+          //Change the StreamReceiver in this else block to change the default data source.
+          else {
+            sr = new StreamReceiver("livedata.americascup.com", 4940, "RaceStream");
+          }
 
-        sr.start();
-        StreamParser streamParser = new StreamParser("StreamParser");
-        streamParser.start();
+          sr.start();
+          StreamParser streamParser = new StreamParser("StreamParser");
+          streamParser.start();
+        }
+        catch (Exception e){
+          Alert alert = new Alert(AlertType.INFORMATION);
+          alert.setTitle("Information Dialog");
+          alert.setHeaderText("Fatal Error");
+          alert.setContentText("There was an error connecting to the AC35 stream");
+
+          alert.showAndWait();
+        }
 
         launch(args);