Don't blow up if command not found and better inital version