Better handling of singular error responses