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

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