Merge "Check for exceptions before calling back into Java"