add check for null property names