Pull phantom Crash handling changes