am a980c7aa: Merge "Re-initialize error after attach"

* commit 'a980c7aa3ec901b7c4201776a9a4e3a5fc3e50df':
  Re-initialize error after attach