Index: branches/5.1.x/units/orders/orders_event_handler.php
===================================================================
diff -u -N -r13930 -r13933
--- branches/5.1.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 13930)
+++ branches/5.1.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 13933)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_event_handler.php 13930 2010-09-10 08:03:12Z alex $
+* @version	$Id: orders_event_handler.php 13933 2010-09-12 16:39:08Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -3764,6 +3764,11 @@
 			$this->Conn->Query($sql);
 		}
 
+		if ( !is_object($event->MasterEvent) ) {
+			// not called as hook
+			return ;
+		}
+
 		$pre_expiration = adodb_mktime() + $this->Application->ConfigValue('User_MembershipExpirationReminder') * 3600 * 24;
 		$to_charge = $this->getRecurringOrders($pre_expiration);