[FIX] check and validate issuer upon payment

I'd nest the common condition between these two to avoid repetition