Issue #78

Improved warning messages