diff --git a/releases/plg_opentools_vm2_rules_shipping_advanced_v3.3.zip b/releases/plg_opentools_vm2_rules_shipping_advanced_v3.3.zip
index 4a408e186306a0a8b3545ad9b96828739af52be2..c51298573734db25b071f666aa5bb7a53a2060e5 100644
Binary files a/releases/plg_opentools_vm2_rules_shipping_advanced_v3.3.zip and b/releases/plg_opentools_vm2_rules_shipping_advanced_v3.3.zip differ
diff --git a/releases/plg_opentools_vm2_rules_shipping_v3.3.zip b/releases/plg_opentools_vm2_rules_shipping_v3.3.zip
index 1fd45e7d3ba4a4f7080992df4cc8767d6363367d..e8d7e7b5167652d1ca241af8d35bf7074e707c37 100644
Binary files a/releases/plg_opentools_vm2_rules_shipping_v3.3.zip and b/releases/plg_opentools_vm2_rules_shipping_v3.3.zip differ
diff --git a/rules_shipping_base.php b/rules_shipping_base.php
index 7e5f7bd31ca7e4a3362c92762a4cec1851d1b8a2..bd580f78ebd4bc42820c28db2f31cf9efbc1406e 100644
--- a/rules_shipping_base.php
+++ b/rules_shipping_base.php
@@ -449,7 +449,7 @@ class plgVmShipmentRules_Shipping_Base extends vmPSPlugin {
 			$data['countryid'] = $address['virtuemart_country_id'];
 			$countriesModel->setId($address['virtuemart_country_id']);
 			$country = $countriesModel->getData();
-			if (isset($country)) {
+			if (!empty($country)) {
 				$data['country'] = $country->country_name;
 				$data['country2'] = $country->country_2_code;
 				$data['country3'] = $country->country_3_code;
@@ -461,7 +461,7 @@ class plgVmShipmentRules_Shipping_Base extends vmPSPlugin {
 			$data['stateid'] = $address['virtuemart_state_id'];
 			$statesModel->setId($address['virtuemart_state_id']);
 			$state = $statesModel->getData();
-			if (isset($state)) {
+			if (!empty($state)) {
 				$data['state'] = $state->state_name;
 				$data['state2'] = $state->state_2_code;
 				$data['state3'] = $state->state_3_code;