First cut of work on issue #46
Tweaked error output