More validation when component is deleted fixes