Merge "Don't call into ResolveType with possible exception"