Improve an error message

Make it easier to identify the associated order.
Merge branch '2-2-stable' into 2-2-dev