Merge "Fix a crash with unresolved classes."