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

* commit '67b37eec48080ac558cd58b49152180a33c99c13':
  Guard against return value already being null