Ensure we handle the scenario the payment service code expects there to be an active span but finds none

Ensure we handle the scenario the payment service code expects there to be an active span but finds none #587