Adding null checking to the identifier.