Index: branches/5.2.x/core/units/helpers/language_import_helper.php
===================================================================
diff -u -N -r15856 -r16296
--- branches/5.2.x/core/units/helpers/language_import_helper.php	(.../language_import_helper.php)	(revision 15856)
+++ branches/5.2.x/core/units/helpers/language_import_helper.php	(.../language_import_helper.php)	(revision 16296)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: language_import_helper.php 15856 2013-07-02 14:56:00Z alex $
+* @version	$Id: language_import_helper.php 16296 2015-10-25 18:02:56Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -724,8 +724,17 @@
 		 */
 		function _updateEventsCache()
 		{
+			$table_name = $this->Application->getUnitOption('email-template', 'TableName');
+
+			// During upgrade from 5.1.x to 5.2.x without this there will be tons of notices.
+			if ( defined('IS_INSTALL') && IS_INSTALL && !$this->Conn->TableFound($table_name, true) ) {
+				$this->events_hash = array();
+
+				return;
+			}
+
 			$sql = 'SELECT TemplateId, CONCAT(TemplateName,"_",Type) AS EventMix
-					FROM ' . $this->Application->getUnitOption('email-template', 'TableName');
+					FROM ' . $table_name;
 			$this->events_hash = $this->Conn->GetCol($sql, 'EventMix');
 		}
 
@@ -1254,4 +1263,4 @@
 
 			return $ids;
 		}
-	}
\ No newline at end of file
+	}