Revert "Revert "More error messages for different user inputs""

This reverts commit 1fcb1eba50c94c745f97f87bf71a5a462107d1dc.