Added fix for nulls and comments for PayChoice