Index: branches/5.2.x/units/orders/orders_item.php
===================================================================
--- branches/5.2.x/units/orders/orders_item.php
+++ branches/5.2.x/units/orders/orders_item.php
@@ -31,8 +31,12 @@
 			parent::SetFieldsFromHash($hash, $set_fields);
 
 			$options = $this->GetFieldOptions('PaymentCCExpDate');
+			$month_field = $options['month_field'];
+			$year_field = $options['year_field'];
 
-			if ( $this->GetDirtyField($options['month_field']) || $this->GetDirtyField($options['year_field']) ) {
+			if ( (isset($hash[$month_field]) && $this->GetDirtyField($month_field))
+				|| (isset($hash[$year_field]) && $this->GetDirtyField($year_field))
+			) {
 				$this->SetDirtyField('PaymentCCExpDate', 0);
 				$this->SetField('PaymentCCExpDate', 0);
 			}