Improve exception handling and user input acceptance.
Merge pull request #1 from robbarry/master

Improve exception handling and user input acceptance.