Add some more null checks.
Fix Update from previous versions in some cases