Added Crash detection