Refactor error reporting logic
Get unit tests passing again