Fix bare excepts
Merge pull request #7 from terminalmage/fix-bare-except

Fix bare excepts