#658 - fixing stack trace and expiry date issue on checkout form