add product id to error message
Merge branch 'error-logging'