Bug 868527 - Add error handling to MakeAPI