Guard against return value already being null
am: 9c42c0b

* commit '9c42c0b70b5f606ea61e879072a5da1a8f67d13a':
  Guard against return value already being null