Added empty checks for payment details