diff --git a/lib/AddressDetails.php b/lib/AddressDetails.php
index 8a4005d9..badf868d 100644
--- a/lib/AddressDetails.php
+++ b/lib/AddressDetails.php
@@ -114,4 +114,9 @@ class AddressDetails
         }
         return $aAddress;
     }
+
+    public function debugInfo()
+    {
+        return $this->aAddressLines;
+    }
 }
diff --git a/lib/DebugHtml.php b/lib/DebugHtml.php
index ff1724d2..a600fae5 100644
--- a/lib/DebugHtml.php
+++ b/lib/DebugHtml.php
@@ -153,6 +153,8 @@ class Debug
                     $sPre = ', ';
                 }
             }
+        } elseif (is_object($mVar) && method_exists($mVar, 'debugInfo')) {
+            Debug::outputVar($mVar->debugInfo(), $sPreNL);
         } else {
             Debug::outputSimpleVar($mVar);
         }