fix error messages

Fix for error messages - #1