am a79239b1: Merge change I2d844842 into eclair

Merge commit 'a79239b102f7b9c83e31be7b3a47ab50459b6a4f' into eclair-mr2

* commit 'a79239b102f7b9c83e31be7b3a47ab50459b6a4f':
  Fix for NPE in #2248683