Bug 965757: Gracefully handle initial build failures from client perspec...

...tive