Empty response handling done properly