Updated code to utilize NSNull's singleton