Added Try/Catch
Merge branch 'master' of https://github.com/suBDavis/clippy