Handle multiple failure messages a little better