diff --git a/commerce_addressbook.module b/commerce_addressbook.module
index d4f4324..078fce6 100644
--- a/commerce_addressbook.module
+++ b/commerce_addressbook.module
@@ -612,7 +612,7 @@ function commerce_addressbook_retrieve_view($view_id, $display_id, $arguments, $
 
   // Prepare and execute the View query.
   $view->pre_execute();
-  $view->execute();
+//  $view->execute();
 
   // Return the view.
   return $view;
diff --git a/includes/commerce_addressbook.user.inc b/includes/commerce_addressbook.user.inc
index e86e6b8..be98b05 100644
--- a/includes/commerce_addressbook.user.inc
+++ b/includes/commerce_addressbook.user.inc
@@ -178,7 +178,8 @@ function commerce_addressbook_profile_page($account, $profile_type) {
     $output .= '<div id="commerce-addressbook-' . $profile_type . '-list">' . $list_view->render() . '</div>';
   }
   if ($output == '') {
-    return '<div class="addressbook-nodata">' . t('Your @profile_type address book is currently empty.', array('@profile_type' => $profile_type)) . '</div>';
+    return '<div class="addressbook-nodata">' . t('Your @profile_type address book is currently empty.',
+      array('@profile_type' => commerce_customer_profile_type_get_name($profile_type))) . '</div>';
   }
   else {
     return $output;