Error handling for the protocol
That wasn't a great idea
Disable tests until I can go through and fix them