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

* commit '9744b79176f0821bdc8c0135b32584d07a37eebf':
  Guard against return value already being null