Fixed issue where payment source could be nil