Index: branches/5.2.x/units/order_items/order_items_tag_processor.php
===================================================================
--- branches/5.2.x/units/order_items/order_items_tag_processor.php
+++ branches/5.2.x/units/order_items/order_items_tag_processor.php
@@ -255,6 +255,9 @@
 		if ( $product_id ) {
 			$product_object->Load($product_id);
 		}
+		else {
+			$this->Application->removeObject('p');
+		}
 
 		return $o;
 	}