diff --git a/main/inc/global.inc.php b/main/inc/global.inc.php
index 61498d1e3e..4e7fbd8881 100644
--- a/main/inc/global.inc.php
+++ b/main/inc/global.inc.php
@@ -234,8 +234,8 @@ if(get_setting('server_type') == 'test')
 	- only do addslashes on $_GET and $_POST
 	--------------------------------------------
 	*/
-	error_reporting(E_ALL & ~E_NOTICE);
-	//error_reporting(E_ALL);
+	//error_reporting(E_ALL & ~E_NOTICE);
+	error_reporting(E_ALL);
 
 	//Addslashes to all $_GET variables
 	foreach($_GET as $key=>$val)
@@ -319,9 +319,13 @@ else
 
 // if we use the javascript version (without go button) we receive a get
 // if we use the non-javascript version (with the go button) we receive a post
-$user_language = $_GET["language"];
+$user_language = '';
+if(!empty($_GET['language']))
+{
+	$user_language = $_GET["language"];
+}
 
-if ($_POST["language_list"])
+if (!empty($_POST["language_list"]))
 {
 	$user_language = str_replace("index.php?language=","",$_POST["language_list"]);
 }
@@ -398,7 +402,7 @@ $charset = api_get_setting('platform_charset');
 
 //Update of the logout_date field in the table track_e_login (needed for the calculation of the total connection time)
 
-if($_configuration['tracking_enabled'] && !isset($_SESSION['login_as']))
+if($_configuration['tracking_enabled'] && !isset($_SESSION['login_as']) && isset($_user))
 { // if $_SESSION['login_as'] is set, then the user is an admin logged as the user
 
 	$tbl_track_login = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_LOGIN);
@@ -414,4 +418,4 @@ if($_configuration['tracking_enabled'] && !isset($_SESSION['login_as']))
 	}
 	
 }
-?>
\ No newline at end of file
+?>
diff --git a/main/inc/lib/main_api.lib.php b/main/inc/lib/main_api.lib.php
index 5109dcd159..1bfbb98399 100644
--- a/main/inc/lib/main_api.lib.php
+++ b/main/inc/lib/main_api.lib.php
@@ -99,6 +99,7 @@ define('SYS_ARCHIVE_PATH', 'SYS_ARCHIVE_PATH');
 define('INCLUDE_PATH', 'INCLUDE_PATH');
 define('LIBRARY_PATH', 'LIBRARY_PATH');
 define('CONFIGURATION_PATH', 'CONFIGURATION_PATH');
+define('WEB_LIBRARY_PATH','WEB_LIBRARY_PATH');
 
 //CONSTANTS defining all tools, using the english version
 define('TOOL_DOCUMENT', 'document');
@@ -1113,7 +1114,7 @@ function get_setting($variable, $key = NULL)
 function api_get_setting($variable, $key = NULL)
 {
 	global $_setting;
-	return is_null($key) ? $_setting[$variable] : $_setting[$variable][$key];
+	return is_null($key) ? (!empty($_setting[$variable])?$_setting[$variable]:null) : $_setting[$variable][$key];
 }
 
 /**
@@ -2666,4 +2667,4 @@ function api_add_setting($val,$var,$sk=null,$type='textfield',$c=null,$title='',
 		return $res;
 	}
 }
-?>
\ No newline at end of file
+?>