Update to fix issues when Null data is found in the database.