LOW: Fixed ComponentSelector
LOW: Prevented some NPE