Merge "Bug 2697: Improvement wrong response handling, missing message"