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

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