Revert "srm: Drop fail fast for protocol checks"

This reverts commit 7d736302bcfab75459ec9519afda4abdb5fd93b0.