Merge change Icef599ec into eclair-mr2

* changes:
  null check