Added a check so only valid components are accepted
Fixes Sync/Async switch.