Merge "Handle failure to pull an external call." into nyc-mr1-dev