Put in more nil window protection.