We need a more robust way of resetting the current area to null

We need a more robust way of resetting the current area to null #1437