diff --git a/uc_addresses.module b/uc_addresses.module
index 1b727a7..53d29d9 100644
--- a/uc_addresses.module
+++ b/uc_addresses.module
@@ -1105,7 +1105,7 @@ function uc_addresses_select_addresses($uid, $context = 'default', $type = 'bill
   $address_book_default_value = NULL;
 
   $options = array(
-    '-1' => t('Select one...'),
+    '' => t('Select one...'),
   );
   foreach ($addresses as $address) {
     switch ($context) {
diff --git a/uc_addresses.ubercart.inc b/uc_addresses.ubercart.inc
index 142a36c..c3f7114 100644
--- a/uc_addresses.ubercart.inc
+++ b/uc_addresses.ubercart.inc
@@ -165,11 +165,14 @@ function uc_addresses_checkout_pane_address($type, $op, $order, $form, &$form_st
 
         if ($element['#name'] == "panes[$pane][select_address]") {
           $address_id = $element['#value'];
-          $address = UcAddressesAddressBook::get($user->uid)->getAddressById($address_id)->copyAddress(UcAddressesAddressBook::get(0));
-          $address_data = $address->getRawFieldData();
-          foreach ($address_data as $field => $value) {
-            $form_state['input']['panes'][$pane][$pane . '_' . $field] = $value;
-            $order->{$pane . '_' . $field} = $value;
+          $address_source = UcAddressesAddressBook::get($user->uid)->getAddressById($address_id);
+          if ($address_source) {
+            $address = $address_source->copyAddress(UcAddressesAddressBook::get(0));
+            $address_data = $address->getRawFieldData();
+            foreach ($address_data as $field => $value) {
+              $form_state['input']['panes'][$pane][$pane . '_' . $field] = $value;
+              $order->{$pane . '_' . $field} = $value;
+            }
           }
         }