HHH-8845 - More informative error message
HHH-8845 formatting