Index: branches/5.2.x/core/units/users/users_event_handler.php
===================================================================
diff -u -N -r14879 -r14951
--- branches/5.2.x/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 14879)
+++ branches/5.2.x/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 14951)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: users_event_handler.php 14879 2011-12-16 15:07:48Z alex $
+* @version	$Id: users_event_handler.php 14951 2011-12-30 08:34:08Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -273,7 +273,7 @@
 				$object->SetError('UserLogin', $result == LoginResult::NO_PERMISSION ? 'no_permission' : 'invalid_password');
 			}
 
-			if ( $event->MasterEvent->Name == 'OnLoginAjax' ) {
+			if ( is_object($event->MasterEvent) && ($event->MasterEvent->Name == 'OnLoginAjax') ) {
 				// used to insert just logged-in user e-mail on "One Step Checkout" form in "Modern Store" theme
 				$user =& $user_helper->getUserObject();
 				$event->SetRedirectParam('user_email', $user->GetDBField('Email'));