Added catch for None components.