#485 - adding null checks to default payment gateway checkout service