Handle NULL setting correctly