Added stuff due to crash