Simplify Shell.js and improve error handling.
Merge pull request #194 from FuegoFro/error_messages

Simplify Shell.js and improve error handling.