Added in a necessary error check, plus logging
Merge branch 'master' of github.com:neworganizing/EA-Tools