Merge change I2d844842 into eclair

* changes:
  Fix for NPE in #2248683