Comment by mbwgh

Thanks. I believe with the additional null checks, this version is safer to use, too!