changed place null check