Cleaned up whitespace and error code name.

fixes for gerrit:994