Preventing the server to crash because of a NPE. Issue TooTallNate#224

Author: raydelto

src/main/java/org/java_websocket/SocketChannelIOHelper.java

@@ -61,7 +61,7 @@ public static boolean batch( WebSocketImpl ws, ByteChannel sockchannel ) throws
 			} while ( buffer != null );
 		}
 
-		if( ws.outQueue.isEmpty() && ws.isFlushAndClose() && ws.getDraft().getRole() == Role.SERVER ) {//
+		if( ws != null && ws.outQueue.isEmpty() && ws.isFlushAndClose() && ws.getDraft() != null && ws.getDraft().getRole() != null && ws.getDraft().getRole() == Role.SERVER ) {//
 			synchronized ( ws ) {
 				ws.closeConnection();
 			}

src/main/java/org/java_websocket/server/WebSocketServer.java

@@ -707,7 +707,11 @@ public void run() {
 					assert ( buf != null );
 					try {
 						ws.decode( buf );
-					} finally {
+					} catch(Exception e){
+						System.err.println("Error while reading from remote connection: " + e);
+					}
+					
+					finally {
 						pushBuffer( buf );
 					}
 				}