Fix Bug 881717 - Handle error conditions from MakeAPI