Added null guard