Guard against return value already being null am: 9c42c0b am: e380dbe am: a013472 am: 9744b79 am: 62c35f6
am: f39a9b0

* commit 'f39a9b0ed9856cf0ee1c9e3d11b61bcb428909ca':
  Guard against return value already being null