diff --git a/VerteilteSysteme-Examples/build/RMIEchoServer.jar b/VerteilteSysteme-Examples/build/RMIEchoServer.jar
index d303674..e3bea6d 100644
Binary files a/VerteilteSysteme-Examples/build/RMIEchoServer.jar and b/VerteilteSysteme-Examples/build/RMIEchoServer.jar differ
diff --git a/VerteilteSysteme-Examples/build/RMIMandelbrotCalculationsServer.jar b/VerteilteSysteme-Examples/build/RMIMandelbrotCalculationsServer.jar
index 1b9e0d2..0a15dc6 100644
Binary files a/VerteilteSysteme-Examples/build/RMIMandelbrotCalculationsServer.jar and b/VerteilteSysteme-Examples/build/RMIMandelbrotCalculationsServer.jar differ
diff --git a/VerteilteSysteme-Examples/build/TCPPerfServer.jar b/VerteilteSysteme-Examples/build/TCPPerfServer.jar
index 0d2c4d8..768e3ed 100644
Binary files a/VerteilteSysteme-Examples/build/TCPPerfServer.jar and b/VerteilteSysteme-Examples/build/TCPPerfServer.jar differ
diff --git a/VerteilteSysteme-Examples/build/TCPServer.jar b/VerteilteSysteme-Examples/build/TCPServer.jar
index 7bfabd7..3eddc34 100644
Binary files a/VerteilteSysteme-Examples/build/TCPServer.jar and b/VerteilteSysteme-Examples/build/TCPServer.jar differ
diff --git a/VerteilteSysteme-Examples/build/TCPServerMulti.jar b/VerteilteSysteme-Examples/build/TCPServerMulti.jar
index c378bce..f8c3998 100644
Binary files a/VerteilteSysteme-Examples/build/TCPServerMulti.jar and b/VerteilteSysteme-Examples/build/TCPServerMulti.jar differ
diff --git a/VerteilteSysteme-Examples/build/UDPServer.jar b/VerteilteSysteme-Examples/build/UDPServer.jar
index ab5aecb..eaa898b 100644
Binary files a/VerteilteSysteme-Examples/build/UDPServer.jar and b/VerteilteSysteme-Examples/build/UDPServer.jar differ
diff --git a/VerteilteSysteme-Examples/build/UDPServerMulti.jar b/VerteilteSysteme-Examples/build/UDPServerMulti.jar
index 35e3cf6..f006cb0 100644
Binary files a/VerteilteSysteme-Examples/build/UDPServerMulti.jar and b/VerteilteSysteme-Examples/build/UDPServerMulti.jar differ
diff --git a/VerteilteSysteme-Examples/build/UDPTimeCounterServer.jar b/VerteilteSysteme-Examples/build/UDPTimeCounterServer.jar
index 2fc948c..f2579b0 100644
Binary files a/VerteilteSysteme-Examples/build/UDPTimeCounterServer.jar and b/VerteilteSysteme-Examples/build/UDPTimeCounterServer.jar differ
diff --git a/VerteilteSysteme-Examples/src/verteiltesysteme/socket/simple/TCPServer.java b/VerteilteSysteme-Examples/src/verteiltesysteme/socket/simple/TCPServer.java
index 64e287a..ad23d2d 100644
--- a/VerteilteSysteme-Examples/src/verteiltesysteme/socket/simple/TCPServer.java
+++ b/VerteilteSysteme-Examples/src/verteiltesysteme/socket/simple/TCPServer.java
@@ -1,29 +1,36 @@
-/* Angelehnt an Kurose/Ross Computernetzwerke (bis 5e Java, ab 6e Python) */
-
-package verteiltesysteme.socket.simple;
-
-import java.io.*;
-import java.net.*;
-
-class TCPServer {
-	public static void main(String argv[]) throws Exception {
-		int tcpPort = 36037;
-		String clientSentence;
-		String capitalizedSentence;
-
-		// Server-Socket erzeugen
-		@SuppressWarnings("resource")
-		ServerSocket welcomeSocket = new ServerSocket(tcpPort);
-		
-		while (true) {
-			Socket connectionSocket = welcomeSocket.accept();
-
-			BufferedReader inFromClient = new BufferedReader(new InputStreamReader(connectionSocket.getInputStream()));
-			DataOutputStream outToClient = new DataOutputStream(connectionSocket.getOutputStream());
-
-			clientSentence = inFromClient.readLine();
-			capitalizedSentence = clientSentence.toUpperCase() + '\n';
-			outToClient.writeBytes(capitalizedSentence);
-		}
-	}
-}
+/* Angelehnt an Kurose/Ross Computernetzwerke (bis 5e Java, ab 6e Python) */
+
+package verteiltesysteme.socket.simple;
+
+import java.io.*;
+import java.net.*;
+
+class TCPServer {
+	public static void main(String argv[]) throws Exception {
+		int tcpPort = 36037;
+		String clientSentence;
+		String capitalizedSentence;
+
+		// Server-Socket erzeugen
+		@SuppressWarnings("resource")
+		ServerSocket welcomeSocket = new ServerSocket(tcpPort);
+		
+		while (true) {
+			Socket connectionSocket = welcomeSocket.accept();
+
+			BufferedReader inFromClient = new BufferedReader(new InputStreamReader(connectionSocket.getInputStream()));
+			DataOutputStream outToClient = new DataOutputStream(connectionSocket.getOutputStream());
+
+			// Try/Catch hinzugefügt, nachdem bei Einsatz Amazon AWS (Healthcheck des ELB) clientSentence null war  
+			try {
+				clientSentence = inFromClient.readLine();
+				capitalizedSentence = clientSentence.toUpperCase() + '\n';
+				outToClient.writeBytes(capitalizedSentence);
+			} catch (IOException ioe) {
+				ioe.printStackTrace();
+			} catch (NullPointerException npe) {
+				npe.printStackTrace();
+			}
+		}
+	}
+}