No more bare excepts
Merge pull request #9 from mattrobenolt/bare-excepts

No more bare excepts