Fixup some error handling in map bugs