Update server.java

See Issue #1 & #2