Fixed NPE with Component