Added friendly message to response errors and fixing tests.
Merge branch 'release/20140809-01'