Fix Bug 876312 - Allow for better handling of MakeAPI fails