Updated some error handling for shell internal functions

Note: committing from inside shell!
Merge branch 'master' of github.com:IcyInsanities/CS101B