Added an early check for components