Revert "srm: Drop fail fast for protocol checks"

This reverts commit 0f5a4d579476094c12e393bd14fdccb90ba99826.