Merge "Handle exceptions on attach" into rvc-dev