Though importantly it does NOT add error messages - that will require a further, probably separate PR...
Though importantly it does NOT add error messages - that will require a further, probably separate PR...