fix some error messages/user feedback