--- uc_addresses_address_pane.inc	2008-12-17 08:05:41.000000000 -0600
+++ uc_addresses_address_pane.inc	2009-01-21 11:13:53.000000000 -0600
@@ -15,6 +15,29 @@
  */
 
 /**
+ * Create an empty address object.
+ *
+ * @return address object.
+ */
+function uc_addresses_default_address() {
+  $address = new stdClass();
+//  $address->aid = '';
+  $address->first_name = '';
+  $address->last_name = '';
+  $address->company = '';
+  $address->street1 = '';
+  $address->street2 = '';
+  $address->city = '';
+  $address->zone = '';
+  $address->postal_code = '';
+  $address->country = '';
+  $address->phone = '';
+  $address->address_name = '';
+  $address->is_default = 0; // What should this be?
+  return $address;
+}
+
+/**
  * Create, edit, process or view the Address pane.
  *
  * @param $op The name of the operation to perform. One of 'new',
@@ -40,6 +63,9 @@
 	'#collapsible' => TRUE,
 	'#collapsed' => FALSE,
 	);
+	if (!$arg1) {
+	  $arg1 = uc_addresses_default_address();
+	}
 
       if (uc_address_field_enabled('first_name')) {
 	$form['address']['first_name'] = uc_textfield(uc_get_field_name('first_name'), $arg1->first_name, uc_address_field_required('first_name'));
@@ -196,6 +222,7 @@
  * @return The themed form (as a string).
  */
 function theme_uc_addresses_pane($form) {
+  $output = '';
   $req = '<span class="form-required">*</span>';
 
   if (isset($form['copy_address'])) {