status/error refactoring
status/error refactoring