Merge change 368 into donut

* changes:
  location: Add some null pointer checks.