diff --git a/addressbook/inc/class.addressbook_import_contacts_csv.inc.php b/addressbook/inc/class.addressbook_import_contacts_csv.inc.php
index 65231774c7..e6e9f5d0a1 100644
--- a/addressbook/inc/class.addressbook_import_contacts_csv.inc.php
+++ b/addressbook/inc/class.addressbook_import_contacts_csv.inc.php
@@ -148,7 +148,7 @@ class addressbook_import_contacts_csv implements importexport_iface_import_plugi
 		$contact_owner = isset( $_definition->plugin_options['contact_owner'] ) ?
 			$_definition->plugin_options['contact_owner'] : $this->user;
 		// Import into importer's personal addressbook
-		if($contact_owner == 'personal') 
+		if($contact_owner == 'personal')
 		{
 			$contact_owner = $this->user;
 		}
@@ -190,12 +190,13 @@ class addressbook_import_contacts_csv implements importexport_iface_import_plugi
 			// Also handle categories in their own field
 			$more_categories = array();
 			foreach($_definition->plugin_options['field_mapping'] as $number => $field_name) {
-				if(substr($field_name,0,3) != 'cat' || !$record[$field_name] || $field_name == 'cat_id') continue;
+				if(!array_key_exists($field_name, $record) ||
+					substr($field_name,0,3) != 'cat' || !$record[$field_name] || $field_name == 'cat_id') continue;
 				list($cat, $cat_id) = explode('-', $field_name);
 				if(is_numeric($record[$field_name]) && $record[$field_name] != 1) {
 					// Column has a single category ID
 					$more_categories[] = $record[$field_name];
-				} elseif($record[$field_name] == '1' || 
+				} elseif($record[$field_name] == '1' ||
 					(!is_numeric($record[$field_name]) && strtolower($record[$field_name]) == strtolower(lang('Yes')))) {
 					// Each category got its own column.  '1' is the database value, lang('yes') is the human value
 					$more_categories[] = $cat_id;
@@ -229,7 +230,7 @@ class addressbook_import_contacts_csv implements importexport_iface_import_plugi
 								if ($condition['string']=='account_id') $searchcondition['owner']=0;
 								$contacts = $this->bocontacts->search(
 									//array( $condition['string'] => $record[$condition['string']],),
-									'', 
+									'',
 									$_definition->plugin_options['update_cats'] == 'add' ? false : true,
 									'', '', '', false, 'AND', false,
 									$searchcondition
@@ -258,7 +259,7 @@ class addressbook_import_contacts_csv implements importexport_iface_import_plugi
 							die('condition / action not supported!!!');
 							break;
 					}
-					if ($action['last']) break;
+					if ($action['stop']) break;
 				}
 			} else {
 				// unconditional insert
diff --git a/addressbook/setup/importexport_default.xml b/addressbook/setup/importexport_default.xml
index d18a175a84..4ad2d8c879 100644
--- a/addressbook/setup/importexport_default.xml
+++ b/addressbook/setup/importexport_default.xml
@@ -240,25 +240,13 @@
               <entry type="string" name="stop">1</entry>
             </entry>
           </entry>
-          <entry type="array" name="1">
-            <entry type="string" name="string">id</entry>
-            <entry type="string" name="type">exists</entry>
-            <entry type="array" name="true">
-              <entry type="string" name="action">update</entry>
-              <entry type="string" name="stop">1</entry>
-            </entry>
-            <entry type="array" name="false">
-              <entry type="string" name="action">insert</entry>
-              <entry type="string" name="stop">1</entry>
-            </entry>
-          </entry>
         </entry>
         <entry type="string" name="owner_from_csv">1</entry>
         <entry type="string" name="contact_owner">personal</entry>
         <entry type="string" name="change_owner">0</entry>
         <entry type="string" name="convert">1</entry>
       </entry>
-      <entry type="string" name="modified">2012-05-15 16:46:54</entry>
+      <entry type="string" name="modified">2012-05-29 16:00:00</entry>
     </entry>
   </entry>
 </entry>