Improved wording of email message
Added error handling pages