Handle crash issue