Fix Bug 876312 - Allow for better handling of MakeAPI fails

https://bugzilla.mozilla.org/show_bug.cgi?id=876312