diff --git a/formats/import_csv_gmail_connector.xml b/formats/import_csv_gmail_connector.xml
index b942fb82..fbf3f407 100644
--- a/formats/import_csv_gmail_connector.xml
+++ b/formats/import_csv_gmail_connector.xml
@@ -156,18 +156,18 @@ author: Nicolas Mora mail@babelouest.org
 		</vcard_entry>
 	</import_entry>
 	
-	<import_entry name="E-mail 1 - Value" enabled="true">
+	<import_entry name="E-mail 1 - Value" enabled="true" separator=":::">
 		<vcard_entry property="EMAIL" group="email1">
 		</vcard_entry>
 	</import_entry>
 	
 	<import_entry name="Phone 1 - Type" enabled="true" remove="*">
-		<vcard_entry property="PHONE" group="phone1" value="type">
+		<vcard_entry property="TEL" group="phone1" value="type">
 		</vcard_entry>
 	</import_entry>
 	
-	<import_entry name="Phone 1 - Value" enabled="true">
-		<vcard_entry property="PHONE" group="phone1">
+	<import_entry name="Phone 1 - Value" enabled="true" separator=":::">
+		<vcard_entry property="TEL" group="phone1">
 		</vcard_entry>
 	</import_entry>
 	
diff --git a/formats/import_csv_yahoo_connector.xml b/formats/import_csv_yahoo_connector.xml
index 337a4cf8..ac318cf7 100644
--- a/formats/import_csv_yahoo_connector.xml
+++ b/formats/import_csv_yahoo_connector.xml
@@ -115,37 +115,37 @@ author: Nicolas Mora mail@babelouest.org
 	</import_entry>
 	
 	<import_entry name="Home" enabled="true">
-		<vcard_entry property="PHONE" type="HOME">
+		<vcard_entry property="TEL" type="HOME">
 		</vcard_entry>
 	</import_entry>
 	
 	<import_entry name="Work" enabled="true">
-		<vcard_entry property="PHONE" type="WORK">
+		<vcard_entry property="TEL" type="WORK">
 		</vcard_entry>
 	</import_entry>
 	
 	<import_entry name="Pager" enabled="true">
-		<vcard_entry property="PHONE" type="PAGER">
+		<vcard_entry property="TEL" type="PAGER">
 		</vcard_entry>
 	</import_entry>
 	
 	<import_entry name="Fax" enabled="true">
-		<vcard_entry property="PHONE" type="FAX">
+		<vcard_entry property="TEL" type="FAX">
 		</vcard_entry>
 	</import_entry>
 	
 	<import_entry name="Mobile" enabled="true">
-		<vcard_entry property="PHONE" type="CELL">
+		<vcard_entry property="TEL" type="CELL">
 		</vcard_entry>
 	</import_entry>
 	
 	<import_entry name="Other" enabled="true">
-		<vcard_entry property="PHONE" type="OTHER">
+		<vcard_entry property="TEL" type="OTHER">
 		</vcard_entry>
 	</import_entry>
 	
 	<import_entry name="Yahoo Phone" enabled="true">
-		<vcard_entry property="PHONE" type="OTHER,YAHOO">
+		<vcard_entry property="TEL" type="OTHER,YAHOO">
 		</vcard_entry>
 	</import_entry>
 	
diff --git a/formats/import_vcard_yahoo_connector.xml b/formats/import_vcard_yahoo_connector.xml
index f8bded63..bc4307a2 100644
--- a/formats/import_vcard_yahoo_connector.xml
+++ b/formats/import_vcard_yahoo_connector.xml
@@ -93,7 +93,7 @@ author: Nicolas Mora mail@babelouest.org
 	</import_entry>
 	
 	<import_entry property="X-PRIMARY-PHONE" enabled="true">
-		<vcard_entry property="PHONE" type="HOME">
+		<vcard_entry property="TEL" type="HOME">
 		</vcard_entry>
 	</import_entry>
 	
diff --git a/lib/connector/importcsvconnector.php b/lib/connector/importcsvconnector.php
index e587a3a2..a7345230 100644
--- a/lib/connector/importcsvconnector.php
+++ b/lib/connector/importcsvconnector.php
@@ -234,8 +234,12 @@ class ImportCsvConnector extends ImportConnector {
 			return 0;
 		} else {
 			$element = $this->convertElementToVCard($parts[0], $titles);
-			$unknownElements = $element->select("X-Unknown-Element");
-			return (1 - (0.5 * count($unknownElements)/count($parts[0])));
+			if ($element) {
+				$unknownElements = $element->select("X-Unknown-Element");
+				return (1 - (0.5 * count($unknownElements)/count($parts[0])));
+			} else {
+				return 0;
+			}
 		}
 	}
 }
diff --git a/lib/connector/importldifconnector.php b/lib/connector/importldifconnector.php
index c082cd70..fc0da178 100644
--- a/lib/connector/importldifconnector.php
+++ b/lib/connector/importldifconnector.php
@@ -207,8 +207,12 @@ class ImportLdifConnector extends ImportConnector{
 			return 0;
 		} else {
 			$element = $this->convertElementToVCard($parts[0]);
-			$unknownElements = $element->select("X-Unknown-Element");
-			return (1 - (0.5 * count($unknownElements)/count($parts[0])));
+			if ($element) {
+				$unknownElements = $element->select("X-Unknown-Element");
+				return (1 - (0.5 * count($unknownElements)/count($parts[0])));
+			} else {
+				return 0;
+			}
 		}
 	}	
 }
diff --git a/lib/connector/importvcardconnector.php b/lib/connector/importvcardconnector.php
index 961ddb45..446b9be2 100644
--- a/lib/connector/importvcardconnector.php
+++ b/lib/connector/importvcardconnector.php
@@ -199,8 +199,12 @@ class ImportVCardConnector extends ImportConnector{
 			return 0;
 		} else {
 			$element = $this->convertElementToVCard($parts[0]);
-			$unknownElements = $element->select("X-Unknown-Element");
-			return (1 - (0.5 * count($unknownElements)/count($parts[0])));
+			if ($element) {
+				$unknownElements = $element->select("X-Unknown-Element");
+				return (1 - (0.5 * count($unknownElements)/count($parts[0])));
+			} else {
+				return 0;
+			}
 		}
 	}