Removed IllegalStateExceptions from Server