Null pointer eliminated. I hope.