improve error messages around bundle != payload hash (#3146)

improve error messages around bundle != payload hash (#3146) #6907