Renamed, and scrutinized for missed potential error conditions.

Alas, I don't have an Indigo, so I could not even compile this.