No crash when stopping the device anymore