Index: branches/5.1.x/units/orders/orders_event_handler.php
===================================================================
diff -u -N -r14158 -r14206
--- branches/5.1.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 14158)
+++ branches/5.1.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 14206)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_event_handler.php 14158 2011-01-11 10:37:05Z alex $
+* @version	$Id: orders_event_handler.php 14206 2011-02-15 17:03:44Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -3533,22 +3533,26 @@
 				$shipping_quote_engine =& $this->Application->recallObject($shipping_quote_engine);
 				/* @var $shipping_quote_engine ShippingQuoteEngine */
 
+				// USPS related part
+				// TODO: remove USPS condition from here				
 				// set first of found shippings just to check if any errors are returned
 				$current_usps_shipping_types = unserialize($this->Application->RecallVar('current_usps_shipping_types'));
 				$object->SetDBField('ShippingInfo', serialize( Array($package => $current_usps_shipping_types[$id])) );
 
 				$sqe_data = $shipping_quote_engine->MakeOrder($object, true);
 
-				if ( !isset($sqe_data['error_number']) ) {
-					// update only international shipping
-					if ( $object->GetDBField('ShippingCountry') != 'USA') {
-						$shipping_types[$package]['TotalCost'] = $sqe_data['Postage'];
+				if ( $sqe_data ) {
+					if ( !isset($sqe_data['error_number']) ) {
+						// update only international shipping
+						if ( $object->GetDBField('ShippingCountry') != 'USA') {
+							$shipping_types[$package]['TotalCost'] = $sqe_data['Postage'];
+						}
 					}
+					else {
+						$ret = false;
+						$this->Application->StoreVar('sqe_error', $sqe_data['error_description']);
+					}
 				}
-				else {
-					$ret = false;
-					$this->Application->StoreVar('sqe_error', $sqe_data['error_description']);
-				}
 
 				$object->SetDBField('ShippingInfo', '');
 			}