yes. As I mentioned in your PR, we should create a helper for error messages.