Merge "Exception handling: make sure to retain stack trace"