Add more specific error messages