Added another null check to the ETL