#164 failure messages enhanced