diff --git a/e107_handlers/e_db_pdo_class.php b/e107_handlers/e_db_pdo_class.php
index 0bb4ddcce6..d5a66ec89f 100644
--- a/e107_handlers/e_db_pdo_class.php
+++ b/e107_handlers/e_db_pdo_class.php
@@ -2718,7 +2718,8 @@ protected function makeTableDef($tableName)
 		$dbAdm = new db_table_admin();
 
 		$baseStruct = $dbAdm->get_current_table($tableName);
-		$fieldDefs = $dbAdm->parse_field_defs($baseStruct[0][2]);					// Required definitions
+		$baseStruct = isset($baseStruct[0][2]) ? $baseStruct[0][2] : null;
+		$fieldDefs = $dbAdm->parse_field_defs($baseStruct);					// Required definitions
 		if (!$fieldDefs) return false;
 
 		$outDefs = array();
diff --git a/e107_handlers/login.php b/e107_handlers/login.php
index 6b2f433285..0c16d72d0a 100644
--- a/e107_handlers/login.php
+++ b/e107_handlers/login.php
@@ -145,7 +145,7 @@ public function login($username, $userpass, $autologin, $response = '', $noredir
 									$authorized = true;
 								break;
 								case LOGIN_TRY_OTHER:
-									continue;
+									continue 2;
 								break;
 							}
 						}
diff --git a/e107_handlers/mysql_class.php b/e107_handlers/mysql_class.php
index d7a5754d60..5c5fbae275 100644
--- a/e107_handlers/mysql_class.php
+++ b/e107_handlers/mysql_class.php
@@ -3157,7 +3157,8 @@ protected function makeTableDef($tableName)
 		$dbAdm = new db_table_admin();
 
 		$baseStruct = $dbAdm->get_current_table($tableName);
-		$fieldDefs = $dbAdm->parse_field_defs($baseStruct[0][2]);					// Required definitions
+		$baseStruct = isset($baseStruct[0][2]) ? $baseStruct[0][2] : null;
+		$fieldDefs = $dbAdm->parse_field_defs($baseStruct);					// Required definitions
 		if (!$fieldDefs) return false;
 
 		$outDefs = array();
diff --git a/e107_tests/tests/unit/e107Test.php b/e107_tests/tests/unit/e107Test.php
index 111fe5edf2..c8ec8e586b 100644
--- a/e107_tests/tests/unit/e107Test.php
+++ b/e107_tests/tests/unit/e107Test.php
@@ -41,8 +41,8 @@ public function testInitCore()
 		//$res = null;
 		include_once(APP_PATH.'/e107_config.php'); // contains $E107_CONFIG = array('site_path' => '000000test');
 
-		$e107_paths = compact('ADMIN_DIRECTORY', 'FILES_DIRECTORY', 'IMAGES_DIRECTORY', 'THEMES_DIRECTORY', 'PLUGINS_DIRECTORY', 'HANDLERS_DIRECTORY', 'LANGUAGES_DIRECTORY', 'HELP_DIRECTORY', 'DOWNLOADS_DIRECTORY','UPLOADS_DIRECTORY','SYSTEM_DIRECTORY', 'MEDIA_DIRECTORY','CACHE_DIRECTORY','LOGS_DIRECTORY', 'CORE_DIRECTORY', 'WEB_DIRECTORY');
-		$sql_info = compact('mySQLserver', 'mySQLuser', 'mySQLpassword', 'mySQLdefaultdb', 'mySQLprefix', 'mySQLport');
+		$e107_paths = @compact('ADMIN_DIRECTORY', 'FILES_DIRECTORY', 'IMAGES_DIRECTORY', 'THEMES_DIRECTORY', 'PLUGINS_DIRECTORY', 'HANDLERS_DIRECTORY', 'LANGUAGES_DIRECTORY', 'HELP_DIRECTORY', 'DOWNLOADS_DIRECTORY','UPLOADS_DIRECTORY','SYSTEM_DIRECTORY', 'MEDIA_DIRECTORY','CACHE_DIRECTORY','LOGS_DIRECTORY', 'CORE_DIRECTORY', 'WEB_DIRECTORY');
+		$sql_info = @compact('mySQLserver', 'mySQLuser', 'mySQLpassword', 'mySQLdefaultdb', 'mySQLprefix', 'mySQLport');
 		$res = $this->e107->initCore($e107_paths, e_ROOT, $sql_info, varset($E107_CONFIG, array()));
 
 		$this->assertEquals('000000test', $res->site_path);