Changes to error output per PR comments