shifting to new branch to unify all error reporting