Properly handle missing base classes