Index: branches/5.2.x/core/units/email_events/email_events_event_handler.php
===================================================================
diff -u -N -r15268 -r15465
--- branches/5.2.x/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 15268)
+++ branches/5.2.x/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 15465)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_events_event_handler.php 15268 2012-04-04 13:55:40Z alex $
+* @version	$Id: email_events_event_handler.php 15465 2012-07-20 15:34:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -97,6 +97,9 @@
 				$module = $this->Application->GetVar('module');
 				$object->addFilter('module_filter', '%1$s.Module = ' . $this->Conn->qstr($module));
 			}
+			else {
+				$object->addFilter('module_filter', '%1$s.Module IN (SELECT Name FROM ' . TABLE_PREFIX . 'Modules WHERE Loaded = 1)');
+			}
 
 			if ( !$event->Special && !$this->Application->isDebugMode() ) {
 				// no special
Index: branches/5.2.x/core/units/phrases/phrases_event_handler.php
===================================================================
diff -u -N -r15222 -r15465
--- branches/5.2.x/core/units/phrases/phrases_event_handler.php	(.../phrases_event_handler.php)	(revision 15222)
+++ branches/5.2.x/core/units/phrases/phrases_event_handler.php	(.../phrases_event_handler.php)	(revision 15465)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: phrases_event_handler.php 15222 2012-03-15 16:38:49Z alex $
+* @version	$Id: phrases_event_handler.php 15465 2012-07-20 15:34:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -37,6 +37,23 @@
 		}
 
 		/**
+		 * Hides phrases from disabled modules
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function SetCustomQuery(kEvent $event)
+		{
+			parent::SetCustomQuery($event);
+
+			$object = $event->getObject();
+			/* @var $object kDBList */
+
+			$object->addFilter('module_filter', '%1$s.Module IN (SELECT Name FROM ' . TABLE_PREFIX . 'Modules WHERE Loaded = 1)');
+		}
+
+		/**
 		 * Apply some special processing to object being
 		 * recalled before using it in other events that
 		 * call prepareObject
Index: branches/5.2.x/core/units/helpers/email_message_helper.php
===================================================================
diff -u -N -r15225 -r15465
--- branches/5.2.x/core/units/helpers/email_message_helper.php	(.../email_message_helper.php)	(revision 15225)
+++ branches/5.2.x/core/units/helpers/email_message_helper.php	(.../email_message_helper.php)	(revision 15465)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_message_helper.php 15225 2012-03-20 09:48:10Z alex $
+* @version	$Id: email_message_helper.php 15465 2012-07-20 15:34:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -80,7 +80,7 @@
 		try {
 			$this->Application->Parser->CompileRaw($object->GetField($field), 'email_template');
 		}
-		catch (ParserException $e) {
+		catch (Exception $e) {
 			if ( $this->Application->isDebugMode() ) {
 				$this->Application->Debugger->appendHTML('<b style="color: red;">Error in Email Template:</b> ' . $e->getMessage() . ' (line: ' . $e->getLine() . ')');
 			}