Merge change 4925 into donut

* changes:
  Fix 2 NPEs in the Browser.