Bug 1001623 - clean up error handling of index returning methods, r=tbsaunde