changed null to ""