Merge "Improve crasher."