diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2dc666b55c8..42cf7ac1711 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,19 @@
 
 This project does not follow a versioning standard. Versions are crafted after the dates; for example, the version 17.7.25 was released on July, 25th in 2017
 
+## 17.10.12
+
+### Fixed
+- Potential bug that could occur when the shipping address step during checkout is skipped/inactive and/or visited as guest
+
+## 17.10.11
+
+### Added
+- Magento 2.2 Support
+
+### Fixed
+- Changed jQuery selector for checkout agreements in certain Magento versions
+
 ## 17.8.17
 
 ### Changed
diff --git a/README.md b/README.md
index 466515630ee..9a7a76cea9a 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ All versions greater than 16.10.17 are based on the heidelpay php-api. (https://
 
 ### Install the heidelpay Magento 2 composer package
 
-```composer require "heidelpay/magento2:17.10.11"```
+```composer require "heidelpay/magento2:17.10.12"```
 
 ### Enable the extension in Magento 2
 
diff --git a/etc/module.xml b/etc/module.xml
index e26aba70947..eb953175f1a 100644
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -1,5 +1,5 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
-    <module name="Heidelpay_Gateway" schema_version="17.10.11" setup_version="17.10.11">
+    <module name="Heidelpay_Gateway" schema_version="17.10.12" setup_version="17.10.12">
         <sequence>
             <module name="Magento_Sales" />
             <module name="Magento_Payment" />
diff --git a/view/frontend/web/js/view/payment/method-renderer/hgw-abstract.js b/view/frontend/web/js/view/payment/method-renderer/hgw-abstract.js
index 8e12fefcfd4..5d9615ac4a9 100644
--- a/view/frontend/web/js/view/payment/method-renderer/hgw-abstract.js
+++ b/view/frontend/web/js/view/payment/method-renderer/hgw-abstract.js
@@ -63,7 +63,7 @@ define(
             getFullName: function() {
                 var name = '', billingAddress = quote.billingAddress();
 
-                if (typeof billingAddress !== 'undefined') {
+                if (billingAddress !== null) {
                     if (typeof billingAddress.firstname !== 'undefined' && billingAddress.firstname !== null) {
                         name += billingAddress.firstname;
                     }
@@ -81,16 +81,18 @@ define(
                 if (name === '') {
                     var tmpName = window.customerData;
 
-                    if (typeof tmpName.firstname !== 'undefined' && tmpName.firstname !== null) {
-                        name += tmpName.firstname;
-                    }
+                    if (tmpName !== null) {
+                        if (typeof tmpName.firstname !== 'undefined' && tmpName.firstname !== null) {
+                            name += tmpName.firstname;
+                        }
 
-                    if (typeof tmpName.middlename !== 'undefined' && tmpName.middlename !== null) {
-                        name +=  ' ' + tmpName.middlename;
-                    }
+                        if (typeof tmpName.middlename !== 'undefined' && tmpName.middlename !== null) {
+                            name +=  ' ' + tmpName.middlename;
+                        }
 
-                    if (typeof tmpName.lastname !== 'undefined' && tmpName.lastname !== null) {
-                        name += ' ' + tmpName.lastname;
+                        if (typeof tmpName.lastname !== 'undefined' && tmpName.lastname !== null) {
+                            name += ' ' + tmpName.lastname;
+                        }
                     }
                 }