Index: branches/5.2.x/units/order_items/order_items_event_handler.php
===================================================================
diff -u -N -r14986 -r15018
--- branches/5.2.x/units/order_items/order_items_event_handler.php	(.../order_items_event_handler.php)	(revision 14986)
+++ branches/5.2.x/units/order_items/order_items_event_handler.php	(.../order_items_event_handler.php)	(revision 15018)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: order_items_event_handler.php 14986 2012-01-04 16:11:56Z alex $
+* @version	$Id: order_items_event_handler.php 15018 2012-01-09 11:41:23Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -200,7 +200,7 @@
 							$main_object->setCheckoutError(OrderCheckoutErrorType::DISCOUNT, $error_code);
 						}
 					}
-					elseif ( $changed_field == 'Quantity' ) {
+					elseif ( $changed_field == 'Quantity' && $this->Application->isDebugMode() ) {
 						// here is how qty is changed:
 						// OLD QTY -> NEW QTY
 						// RECALCULATE
Index: branches/5.2.x/units/orders/orders_event_handler.php
===================================================================
diff -u -N -r15009 -r15018
--- branches/5.2.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 15009)
+++ branches/5.2.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 15018)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_event_handler.php 15009 2012-01-06 20:37:54Z alex $
+* @version	$Id: orders_event_handler.php 15018 2012-01-09 11:41:23Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -2472,7 +2472,7 @@
 			$object->SetDBField('PaymentNameOnCard', $object->GetDBField('BillingTo'));
 		}
 
-		if ( $event->MasterEvent->Name == 'OnUpdateAjax' && $this->Application->GetVar('create_account') && $object->Validate() ) {
+		if ( is_object($event->MasterEvent) && $event->MasterEvent->Name == 'OnUpdateAjax' && $this->Application->GetVar('create_account') && $object->Validate() ) {
 			$this->createAccountFromOrder($event);
 		}
 	}
@@ -3049,6 +3049,14 @@
 			return false;
 		}
 
+		$item_data = $event->getEventParam('ItemData');
+		$item_data = $item_data ? unserialize($item_data) : Array ();
+		$options = getArrayValue($item_data, 'Options');
+
+		if ( !$this->CheckOptions($event, $options, $item_id, $qty, $product->GetDBField('OptionsSelectionMode')) ) {
+			return;
+		}
+
 		$manager =& $this->Application->recallObject('OrderManager');
 		/* @var $manager OrderManager */