refs #38 change server response handling