Updated the schema to correct case on Error.Message.  Added test for error case and refactored to use closures.