diff --git a/lib/WebGUI/Shop/AddressBook.pm b/lib/WebGUI/Shop/AddressBook.pm
index 289d5a9d3..6fda07211 100644
--- a/lib/WebGUI/Shop/AddressBook.pm
+++ b/lib/WebGUI/Shop/AddressBook.pm
@@ -197,7 +197,7 @@ sub getDefaultAddress {
             return $address;
         }
     }
-    return undef;
+    WebGUI::Error::ObjectNotFound->throw(error=>"No default address.");
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Shop/Cart.pm b/lib/WebGUI/Shop/Cart.pm
index b04050c2a..b0de7e332 100644
--- a/lib/WebGUI/Shop/Cart.pm
+++ b/lib/WebGUI/Shop/Cart.pm
@@ -813,7 +813,7 @@ sub www_view {
     }
     
     # if there is no shipping address we can't check out
-    if (WebGUI::Error->caught || not defined $address) {
+    if (WebGUI::Error->caught) {
        $var{shippingPrice} = $var{tax} = $self->formatCurrency(0); 
     }