Sjs/dont throw

Fixes #31