Add robustness to signal negotiation.