Changed the exception to hopefully something more general
Merge pull request #2 from peppers818/master

Changed the exception to hopefully something more general