dont throw errors
Fix broken assertions
Merge pull request #32 from samccone/sjs/dont-throw

Sjs/dont throw