Bugfix: forgot to not throw after handling