--- class.em_index.php.bak	2011-03-21 17:55:44 +0300
+++ class.em_index.php	2011-03-21 19:12:10 +0300
@@ -5850,6 +5850,12 @@
 			);
 			$response['resultMessages'][] = $this->updateLocalEM_CONF($em['extKey'],$em['extInfo']);
 		}
+		elseif ((-1) == $response['resultCode']) {
+			$response['resultMessages'] = array(
+				$GLOBALS['LANG']->getLL('terCommunication_nosoap_1'),
+				$GLOBALS['LANG']->getLL('terCommunication_nosoap_2')
+			);
+		}
 
 		$msg = '<ul><li>'.implode('</li><li>',$response['resultMessages']).'</li></ul>';
 		return $msg;
@@ -6202,4 +6208,4 @@
 	include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/mod/tools/em/index.php']);
 }
 
-?>
\ No newline at end of file
+?>
--- class.em_terconnection.php.bak	2011-03-21 17:48:51 +0300
+++ class.em_terconnection.php	2011-03-21 23:30:28 +0300
@@ -311,7 +311,12 @@
 		}
 
 		$soap = t3lib_div::makeInstance('em_soap');
-		$soap->init(array('wsdl'=>$this->wsdlURL,'soapoptions'=> array('trace'=>1,'exceptions'=>0)));
+		$soapInitStatus = $soap->init(
+			array('wsdl'=>$this->wsdlURL,'soapoptions'=> array('trace'=>1,'exceptions'=>0))
+		);
+		if (!$soapInitStatus)
+			return array('resultCode' => (-1)); // SOAP module not installed
+
 		$response = $soap->call('uploadExtension', array('accountData' => $accountData, 'extensionData' => $extensionData, 'filesData' => $filesData));
 
 		if($response===false) {
@@ -328,4 +333,4 @@
 	}
 }
 
-?>
\ No newline at end of file
+?>
--- class.em_soap.php.bak	2011-03-21 17:25:13 +0300
+++ class.em_soap.php	2011-03-21 23:41:19 +0300
@@ -118,6 +118,8 @@
 			default:
 				$this->client = false;
 		}
+
+		return ($this->client !== false);
 	}
 
 	/**
@@ -410,4 +412,4 @@
 	}
 }
 
-?>
\ No newline at end of file
+?>