Fixing a crash before it happens :D