changed exception types and innerclass references to classref_or_classinfo