Add shell uninstall and error trapping