Merge "Add null pointer check for component name" into main