more error refactoring
more errh refactor work