Bugfix: Exception re-raising