yeah, your tighter approach looks better and simpler (null also handled).