Merge "Re-initialize error after attach"