Add additional condition checks before signal and collect