Feature/809 finalexception not caught

# Warning 
# Info 
# Issues
Fixes #809.