Added small null checking in the name_for_component method.
Added small null checking in the name_for_component method.
concord-consortium/rigse,concord-consortium/rigse,concord-consortium/rigse,concord-consortium/rigse,concord-consortium/rigse,concord-consortium/rigse