Fixed NullChecks