--- uc_vat.module-orig	2011-08-17 08:28:51.000000000 -0400
+++ uc_vat.module	2011-08-18 10:16:44.000000000 -0400
@@ -470,6 +470,12 @@
   switch ($context['type']) {
     case 'product':
     case 'cart_item':
+       // Avoids applying tax and other changes when full info unavailable.
+       // Based on fix for bug at http://drupal.org/node/1170992 and caused by
+       // ubercart patch located here http://drupal.org/node/898776 that was 
+       // put in Ubercart 6.26.
+       // - ggalante 08/18/11
+    	$tax_rates = array();
     case 'order_product':
       $node = $context['subject']['node'];
 
@@ -514,8 +520,16 @@
 
   // Ensure we have a country code for the order.
   if (!isset($order->billing_country) || !isset($order->delivery_country)) {
-    // Default to store country.
-    $country_id = variable_get('uc_store_country', 840);
+    
+  	// Dangerous to use the default for all instances of loading tax rules. 
+  	// Should be a configuration option in some way. Commenting out for now.
+  	// Based on fix for bug at http://drupal.org/node/1170992 and caused by
+  	// ubercart patch located here http://drupal.org/node/898776 that was 
+  	// put in Ubercart 6.26.
+  	// - ggalante 08/18/11
+  	
+  	// Default to store country.
+    #$country_id = variable_get('uc_store_country', 840);
 
     // TODO: find alternative ways of guessing the country if we do not know it
     // - If user is logged in, look for previous completed orders and assume the same country will be used?