enhance error messages in future