modified import null checking