SIDP-464: additional checking to guard against an outbound mismatch