add empty component check