changed exception handling
Merge pull request #11 from lumoslabs/change_exception_handling

changed exception handling