no callback: only throw if there's no error!
Merge pull request #54 from jonathanong/patch-2

no callback: only throw if there's no error!