Merge "Exception and death notification handling for ISap."