Index: commerce_sagepay_form.module
===================================================================
--- commerce_sagepay_form.module	(revision 4829)
+++ commerce_sagepay_form.module	(working copy)
@@ -443,10 +443,10 @@
       '@statusdetail' => $tokens['StatusDetail'],
       '@vpstxid' => $tokens['VPSTxId'],
       '@authcode' => $tokens['TxAuthNo'],
-      '@address' => $tokens['AddressResult'],
-      '@postcode' => $tokens['PostCodeResult'],
-      '@avs' => $tokens['AVSCV2'],
-      '@tds' => $tokens['3DSecureStatus'],
+      '@address' => isset($tokens['AddressResult']) ? $tokens['AddressResult'] : 'N/A',
+      '@postcode' => isset($tokens['PostCodeResult']) ? $tokens['PostCodeResult'] : 'N/A',
+      '@avs' => isset($tokens['AVSCV2']) ? $tokens['AVSCV2'] : 'N/A',
+      '@tds' => isset($tokens['3DSecureStatus']) ? $tokens['3DSecureStatus'] : 'N/A',
     );
   commerce_payment_transaction_save($transaction);