improve error messages around bundle != payload hash

improve error messages around bundle != payload hash #5747