Allow fatal errors to propagate back to caller
Merge pull request #3 from SciLifeLab/master

merge from upstream
Merge pull request #359 from mariogiov/master

Allow fatal errors to propagate back to caller