Include better failure messages