Merge change 4374 into donut

* changes:
  Fixes a potential NPE in View.