Merge pull request #159 from akkie/master

Check if exception was thrown in future
Fixes #156