Merge "ART: Fix re-throwing failures of non-convention errors"