Actually fixed exception handling after function calls.