cleanup and try/catch
Merge pull request #1 from willtp87/7.x.exceptional

cleanup and try/catch