Added a prompt
Improved error messages