Improved messaging (related to fix for issue #47).