Merge "Fix double-exception in super-class method validation."