Fixed null componentmapper in systems