diff --git uc_protx_vsp_direct.module uc_protx_vsp_direct.module
old mode 100644
new mode 100755
index dd28825..f53d585
--- uc_protx_vsp_direct.module
+++ uc_protx_vsp_direct.module
@@ -351,14 +351,14 @@ function uc_protx_vsp_direct_charge($order_id, $amount, $data) {
     'BillingPostCode' => substr($order->billing_postal_code, 0, 10),
     'BillingCountry' => $billing_country[0]['country_iso_code_2'],
     'BillingPhone' => substr($order->billing_phone, 0, 20),
-    'DeliverySurname' => substr($order->delivery_last_name, 0, 20),
-    'DeliveryFirstnames' => substr($order->delivery_first_name, 0, 20),
-    'DeliveryAddress1' => substr($order->delivery_street1, 0, 100),
-    'DeliveryAddress2' => substr($order->delivery_street2, 0, 100),
-    'DeliveryCity' => substr($order->delivery_city, 0, 40),
-    'DeliveryPostCode' => substr($order->delivery_postal_code, 0, 10),
-    'DeliveryCountry' => $delivery_country[0]['country_iso_code_2'],
-    'DeliveryPhone' => substr($order->delivery_phone, 0, 20),
+    'DeliverySurname' => $order->delivery_last_name ? substr($order->delivery_last_name, 0, 20) : substr($order->billing_last_name, 0, 20),
+    'DeliveryFirstnames' => $order->delivery_first_name ? substr($order->delivery_first_name, 0, 20) : substr($order->billing_first_name, 0, 20),
+    'DeliveryAddress1' => $order->delivery_street1 ? substr($order->delivery_street1, 0, 100) : substr($order->billing_street1, 0, 100),
+    'DeliveryAddress2' => $order->delivery_street2 ? substr($order->delivery_street2, 0, 100) : substr($order->billing_street2, 0, 100),
+    'DeliveryCity' => $order->delivery_city ? substr($order->delivery_city, 0, 40) : substr($order->billing_city, 0, 40),
+    'DeliveryPostCode' => $order->delivery_postal_code ? substr($order->delivery_postal_code, 0, 10) : substr($order->billing_postal_code, 0, 10),
+    'DeliveryCountry' => $delivery_country[0]['country_iso_code_2'] ? $delivery_country[0]['country_iso_code_2'] : $billing_country[0]['country_iso_code_2'],
+    'DeliveryPhone' => $order->delivery_phone ? substr($order->delivery_phone, 0, 20) : substr($order->billing_phone, 0, 20),
     'GiftAidPayment' => '0',
     'ApplyAVSCV2' => '0',
     'Apply3DSecure' => '0',