Index: /model/wpsg_order.class.php
===================================================================
--- /model/wpsg_order.class.php	(revision 5857)
+++ /model/wpsg_order.class.php	(revision 5862)
@@ -788,5 +788,5 @@
 			
 			if ($this->hasShippingAdress()) return $this->shipping_adress_data['land'];
-			else return $this->getInvoiceCountryID(); 
+			else return $this->data['shipping_land']; 
 			 
 		} // public function getShippingCountryID()
@@ -809,5 +809,9 @@
 		{
 			
-			return $this->getShippingCountry()->getShorttext(); 
+			$shippingCountry = $this->getShippingCountry();
+			
+			if (!is_object($shippingCountry)) return __('Nicht definiert.', 'wpsg');
+			else return $this->getShippingCountry()->getShorttext();  
+			
 			
 		} // public function getShippingCountryKuerzel()
@@ -819,5 +823,8 @@
 		{
 			
-			return $this->getShippingCountry()->getName();
+			$shippingCountry = $this->getShippingCountry();
+			 
+			if (!is_object($shippingCountry)) return __('Nicht definiert.', 'wpsg');
+			else return $this->getShippingCountry()->getName(); 
 			
 		}