Correction for "null" parent class in import-generated model objects.
(cherry-picked from 0956d10)