Merge "Re-throw reflective exceptions"