Removing references to the environment variables
Added newline to error output.