CSS: Added null checks. Fixed #1631
CSS: More null checks
PreBuild: Update to latest NPM.