Merge change 2934 into donut

* changes:
  Don't crash on null edit url.