removed exceptions
Merge pull request #155 from ljwolford/1.0bugs

removed exceptions