Index: typo3/sysext/em/classes/connection/class.tx_em_connection_extdirectserver.php
===================================================================
--- typo3/sysext/em/classes/connection/class.tx_em_connection_extdirectserver.php	(revision 9742)
+++ typo3/sysext/em/classes/connection/class.tx_em_connection_extdirectserver.php	(revision )
@@ -612,7 +612,7 @@
 				'label' => $label,
 				'lang' => $language,
 				'cls' => $cls,
-				'selected' => in_array($language, $selected) ? 1 : 0
+				'selected' => is_array($selected) && in_array($language, $selected) ? 1 : 0
 			);
 		}
 		return array(
Index: typo3/sysext/em/ext_tables.php
===================================================================
--- typo3/sysext/em/ext_tables.php	(revision 9742)
+++ typo3/sysext/em/ext_tables.php	(revision )
@@ -4,7 +4,7 @@
 }
 
 if (TYPO3_MODE === 'BE') {
-	t3lib_extMgm::addModule('tools', 'em', 'after:layout', t3lib_extMgm::extPath($_EXTKEY) . 'classes/');
+	t3lib_extMgm::addModule('tools', 'em', '', t3lib_extMgm::extPath($_EXTKEY) . 'classes/');
 		// register Ext.Direct
 	$TYPO3_CONF_VARS['SC_OPTIONS']['ExtDirect']['TYPO3.EM.ExtDirect'] = t3lib_extMgm::extPath($_EXTKEY) . 'classes/connection/class.tx_em_connection_extdirectserver.php:tx_em_Connection_ExtDirectServer';
 	$TYPO3_CONF_VARS['SC_OPTIONS']['ExtDirect']['TYPO3.EMSOAP.ExtDirect'] = t3lib_extMgm::extPath($_EXTKEY) . 'classes/connection/class.tx_em_connection_extdirectsoap.php:tx_em_Connection_ExtDirectSoap';
Index: typo3/sysext/em/classes/class.tx_em_extensionmanager.php
===================================================================
--- typo3/sysext/em/classes/class.tx_em_extensionmanager.php	(revision 9743)
+++ typo3/sysext/em/classes/class.tx_em_extensionmanager.php	(revision )
@@ -148,7 +148,7 @@
 		$settings = $this->parentObject->MOD_SETTINGS;
 		$settings['siteUrl'] = t3lib_div::getIndpEnv('TYPO3_SITE_URL');
 		$settings['backPath'] = $this->parentObject->doc->backPath;
-		$settings['hasCredentials'] = ($settings['fe_u'] !== '' && $settings['fe_p'] !== '');
+		$settings['hasCredentials'] = (isset($settings['fe_u']) && isset($settings['fe_p']) && $settings['fe_u'] !== '' && $settings['fe_p'] !== '');
 		$settings['scriptLink'] = $this->parentObject->script;
 
 		// TODO add mirrors to sys_ter record and delete from settings
Index: typo3/sysext/em/classes/connection/class.tx_em_connection_extdirectsoap.php
===================================================================
--- typo3/sysext/em/classes/connection/class.tx_em_connection_extdirectsoap.php	(revision 9742)
+++ typo3/sysext/em/classes/connection/class.tx_em_connection_extdirectsoap.php	(revision )
@@ -64,7 +64,7 @@
 		/** @var $repository tx_em_Repository */
 		$this->repository = t3lib_div::makeInstance('tx_em_Repository', $this->settings['selectedRepository']);
 
-		if ($this->settings['fe_u'] && $this->settings['fe_p']) {
+		if (isset($this->settings['fe_u']) && isset($this->settings['fe_p']) && $this->settings['fe_u'] != '' && $this->settings['fe_p'] != '' ) {
 			$this->setAccountData($this->settings['fe_u'], $this->settings['fe_p']);
 		}
 
@@ -189,7 +189,7 @@
 				'username' => $this->settings['fe_u']
 			)
 		);
-		$result = @$this->soapCall('getExtensionKeys', $params);
+		$result = $this->soapCall('getExtensionKeys', $params);
 		$data = $this->addUploads($result['extensionKeyData']);
 
 		if ($result['simpleResult']['resultCode'] == 10000 && $data !== NULL) {