improve exception safety
Merge branch 'master' of github.com:nicball/cljc