More correct fix for merging stacktrace/exception