Merge pull request #150 from jonasdt/master

Fix #148 from Jonas, by not dying in case of an exception being thrown.