Fixed crash detection

>Also fixed duplicate crash issue