Index: branches/5.3.x/core/kernel/utility/event.php
===================================================================
diff -u -N -r15698 -r16181
--- branches/5.3.x/core/kernel/utility/event.php	(.../event.php)	(revision 15698)
+++ branches/5.3.x/core/kernel/utility/event.php	(.../event.php)	(revision 16181)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: event.php 15698 2013-02-19 11:33:17Z alex $
+* @version	$Id: event.php 16181 2015-05-15 16:54:20Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -134,39 +134,41 @@
 		 * Parameter $params could be be an an array with following  keys: "prefix", "special" (optional), "name".
 		 * Parameter $params could be a string in format: "prefix:name" or "prefix.special:name".
 		 *
-		 * @param mixed $params
-		 * @param Array $specific_params event specific params (none by default)
-		 * @return kEvent
-		 * @access public
+		 * @param mixed $params          Params.
+		 * @param array $specific_params Event specific params (none by default).
+		 *
+		 * @throws InvalidArgumentException When incorrect event string given.
 		 */
 		public function __construct($params = Array(), $specific_params = null)
 		{
 			parent::__construct();
 
-			if ($params) {
+			if ( $params ) {
 				if ( is_array($params) ) {
 					$prefix = isset($params['prefix']) ? $params['prefix'] : false;
 					$special = isset($params['special']) ? $params['special'] : false;
 
-					if ($prefix) {
+					if ( $prefix ) {
 						$this->Init($prefix, $special);
 					}
 
 					$this->Name = isset($params['name']) ? $params['name'] : '';
 				}
 				elseif ( is_string($params) ) {
-					if (preg_match('/([^.:]*)[.]{0,1}([^:]*):(.*)/', $params, $regs)) {
+					if ( preg_match('/([^.:]*)[.]{0,1}([^:]*):(.*)/', $params, $regs) ) {
 						$prefix = $regs[1];
 						$special = $regs[2];
 
-						if ($prefix) {
+						if ( $prefix ) {
 							$this->Init($prefix, $special);
 						}
 
 						$this->Name = $regs[3];
 					}
 					else {
-						throw new Exception('Invalid event string: "<strong>' . $params . '</strong>". Should be in "prefix[.special]:OnEvent" format');
+						$error_msg = 'Invalid event string: "<strong>' . $params . '</strong>". ';
+						$error_msg .= 'Should be in "prefix[.special]:OnEvent" format';
+						throw new InvalidArgumentException($error_msg);
 					}
 				}
 			}
@@ -445,4 +447,4 @@
 		{
 			return $this->getPrefixSpecial() . ':' . $this->Name;
 		}
-	}
\ No newline at end of file
+	}