Improved error messages so I can see what's failing.