Multi bug fixes around empty response handling (client and server)