Merge "Propagate exception to error code"
am: beaa7e2488

Change-Id: Ief49576a6d160c2b89370b2a182c285f5e3bb9a4