Better error messages in production to diagnose problem