am 75939a2b: Merge "Fix double-exception in super-class method validation."

* commit '75939a2ba24ca4da3f33f89928cca1540c5ddfc6':
  Fix double-exception in super-class method validation.