Make site more resilient to errors