Merge "Fix exception checking after native prepare call" into udc-dev