Merge "Correctly Destroy a Connection when there is an Error" into pi-dev
am: 2dad1301d6

Change-Id: I935b9edb0c33d21cd691707837e3a911466aab15