Merge "Fix MultiHttpClient to return correct errors"