Try terminate now does not call the catch function, now they have the same caller. This involved updating some platform dependent code which should be correct in all cases.