Merge "TIF: fix NPE caused by invalid component name"