Merge change I95319bde into eclair

* changes:
  Fixes #2175599. Prevents an NPE when AttachInfo is null.