PLAIN: Implement ERROR handling in client
Merge pull request #1032 from hurtonm/master

PLAIN: Implement ERROR handling in client