Merge change I0e09e56f into eclair

* changes:
  Don't callback on NULL client. Bug 2180510.