Minimal ERROR handling to prevent CALL hang; SUBSCRIBE/UNSUBSCRIBE changes to allow multiple calls

I wanted to break these into two separate pull requests in case you didn't want either of them as-is, but I'm not sure how to do that. In any case, these are a couple of changes I've had to make to get a simple test client working.