[fix] effectively handle errors when we hit particular statusCodes as well