Be more resilient to crashes