Changed all null to NULL