This commit fixes following issues: 1. 'Unexpected response' error message was returned, even if upstream did not return anything 2. Inability to handle non-20x messages with checking response body