just remove this condition and always call `Payment::get($paymentId);`