Fix a few places where a complete ERROR message was not being sent.