am ad509fd4: Merge "Fix potential crash"

* commit 'ad509fd4a2c597ced8e53b0817f754cb2209b98a':
  Fix potential crash