From 63da2a3b75c1a8dd593a5eb46f331f2568d79581 Mon Sep 17 00:00:00 2001
From: Simon Lindholm <simon.lindholm10@gmail.com>
Date: Sun, 22 Jan 2017 17:31:11 +0100
Subject: [PATCH] Avoid a NullPointerException in NetServer.onError

---
 src/main/battlecode/server/NetServer.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/battlecode/server/NetServer.java b/src/main/battlecode/server/NetServer.java
index 08487310..ba995689 100644
--- a/src/main/battlecode/server/NetServer.java
+++ b/src/main/battlecode/server/NetServer.java
@@ -162,6 +162,7 @@ public void onMessage(WebSocket ws, String s) {
 
     @Override
     public void onError(WebSocket conn, Exception ex) {
-        System.err.println("Error from: "+conn.getRemoteSocketAddress()+": "+ex);
+        String addr = conn != null ? conn.getRemoteSocketAddress()+"" : "<unknown>";
+        System.err.println("Error from: "+addr+": "+ex);
     }
 }