FIX to prevent mapping-exceptions in case of missing attribute names