improve error msgs.  Ready for Mac testing