am d4d2ba80: Merge "Fix crash while connecting channel."

* commit 'd4d2ba8037b3262d01ba26a7fe007e86a38b1ab1':
  Fix crash while connecting channel.