Bug 8803 - Fix crash in API