Merge pull request #1032 from hurtonm/master

PLAIN: Implement ERROR handling in client
PLAIN: Fix parsing of ERROR command
PLAIN: Implement ERROR handling in server