Better error messages on ... error messages!