Propagate exception to error code am: 2e5bf55660

Change-Id: Ib88c4187e10662b3a2663d6facb067f43f65f3cd