NULL: Correct ERROR command format
Merge pull request #1034 from hurtonm/master

NULL: Correct ERROR command format