Modifications to upgrade the server. Corrected an NPE on the client side.