From 528fb7ca8dd7d1aa2a329d81968b88e9c59a785f Mon Sep 17 00:00:00 2001
From: Eiren Rain <eirenliel@users.noreply.github.com>
Date: Sat, 3 Jul 2021 01:54:08 +0300
Subject: [PATCH] Fix NPE, better exception handling on startup

---
 src/main/java/io/eiren/vr/Main.java             | 17 +++++++++++++----
 .../eiren/vr/processor/TrackerBodyPosition.java |  2 +-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/eiren/vr/Main.java b/src/main/java/io/eiren/vr/Main.java
index 94ac1075a..ce5d719b0 100644
--- a/src/main/java/io/eiren/vr/Main.java
+++ b/src/main/java/io/eiren/vr/Main.java
@@ -19,10 +19,19 @@ public class Main {
 			e1.printStackTrace();
 		}
 		
-		VRServer vrServer = new VRServer();
-		vrServer.start();
-		
-		new VRServerGUI(vrServer);
+		try {
+			VRServer vrServer = new VRServer();
+			vrServer.start();
+			new VRServerGUI(vrServer);
+		} catch(Throwable e) {
+			e.printStackTrace();
+		} finally {
+			try {
+				Thread.sleep(2000L);
+			} catch(InterruptedException e) {
+				e.printStackTrace();
+			}
+		}
 	}
 	
 }
diff --git a/src/main/java/io/eiren/vr/processor/TrackerBodyPosition.java b/src/main/java/io/eiren/vr/processor/TrackerBodyPosition.java
index 559337dcf..8b58cbc9a 100644
--- a/src/main/java/io/eiren/vr/processor/TrackerBodyPosition.java
+++ b/src/main/java/io/eiren/vr/processor/TrackerBodyPosition.java
@@ -26,7 +26,7 @@ public enum TrackerBodyPosition {
 	}
 	
 	public static TrackerBodyPosition getByDesignation(String designation) {
-		return byDesignation.get(designation.toLowerCase());
+		return designation == null ? null : byDesignation.get(designation.toLowerCase());
 	}
 	
 	static {