Index: uc_multiprice.module
===================================================================
--- uc_multiprice.module	(revision 10)
+++ uc_multiprice.module	(working copy)
@@ -88,6 +88,9 @@
     'uc_multiprice_form' => array(
       'arguments' => array('form' => NULL),
     ),
+    'uc_multiprice_unavailable' => array(
+      'arguments' => array('text' => NULL),
+    ),
   );
 }
 
@@ -319,6 +322,7 @@
                 // and if multiprice currency price handler is enabled
                 if ($pricehandlers['hook_data']['uc_multiprice']) {
                   $node->disabled_unpriced_product = TRUE;
+                  $node->sell_price = NULL;
                 }
               }
             }
@@ -343,13 +347,13 @@
         db_query("DELETE FROM {uc_multiprice} WHERE nid = %d", $node->nid);
         unset($node->multiprice['multiprices'][0]);
         foreach ((array)$node->multiprice['multiprices']['country'] as $country_id => $country) {
-          if (empty($country->delete)) {
+          if (empty($country['delete'])) {
             db_query("INSERT INTO {uc_multiprice} (nid, country_id, list_price, cost, sell_price, data, role_id) VALUES (%d, %d, %f, %f, %f, '%s', %d)",
               $node->nid, $country['country_id'], $country['list_price'], $country['cost'], $country['sell_price'], serialize($country['dynamic']), $country['role_id']);
           }
         }
         foreach ((array)$node->multiprice['multiprices']['role'] as $role_id => $role) {
-          if (empty($role->delete)) {
+          if (empty($role['delete'])) {
             db_query("INSERT INTO {uc_multiprice} (nid, country_id, list_price, cost, sell_price, data, role_id) VALUES (%d, %d, %f, %f, %f, '%s', %d)",
               $node->nid, $role['country_id'], $role['list_price'], $role['cost'], $role['sell_price'], serialize($role['dynamic']), $role['role_id']);
           }
@@ -361,8 +365,7 @@
       case 'view':
         if ($node->disabled_unpriced_product) {
           $node->content['display_price']['#access'] = FALSE;
-          // @todo probably this should be ran thru a theme function
-          $node->content['sell_price']['#value'] = '<div class="product-unavailable">' . t('This listing is currently not available.') . '</div>';
+          $node->content['sell_price']['#value'] = theme('uc_multiprice_unavailable', 'This listing is currently not available.');
           $node->content['add_to_cart']['#access'] = FALSE;
         }
       break;
@@ -604,6 +607,11 @@
   return $_SESSION['country_id'];
 }
 
+function theme_uc_multiprice_unavailable($text) {
+  $output = '<div class="product-unavailable">' . t($text) . '</div>';
+  return $output;
+}
+
 function theme_uc_multiprice_form($form) {
   $output = '';
   $header = array(t('Country/role'), t('List price'), t('Cost'), t('Sell price'), t('Delete'));