Merge "Fix invalid exception module usage"