Added nil comparison