diff --git a/evanced_events_importer.xml2node.inc b/evanced_events_importer.xml2node.inc
index f53bf8a..4d7e220 100644
--- a/evanced_events_importer.xml2node.inc
+++ b/evanced_events_importer.xml2node.inc
@@ -144,10 +144,10 @@ function evanced_events_importer_offsite_address($node_values_array) {
   $xmlmapper_config_settings = evanced_events_importer_load_configuration('evanced_events_importer_xmlmapper', 'addressfield');
 
   // Set the address-related XML elements as a variable.
-  $element_address = $xmlmapper_config_settings[0]->xml_elements;
+  $element_address = ((count($xmlmapper_config_settings) > 0) ? trim($xmlmapper_config_settings[0]->xml_elements) : "");
 
   // Determine if any addresses data exists.
-  if (trim($node_values_array[$element_address]) != '') {
+  if ((trim($element_address) != '') && (trim($node_values_array[$element_address]) != '')) {
 
     // Replace any incorrectly-formatted line break tags with the correct version.
     $node_values_array[$element_address] = str_replace(chr(60) . 'br' . chr(62),  '<br />', $node_values_array[$element_address]);
@@ -548,7 +548,7 @@ function evanced_events_importer_select_node_action($id, $lastupdated, &$nid, &$
            "  FROM  {node} n, {field_data_" . trim($fieldname_evanced_id) . "} eid " .
            " WHERE  eid.entity_id = n.nid " .
            "   AND  eid.bundle = :bundle " .
-           "   AND  eid.field_evanced_id_value = :evanced_id ";
+           "   AND  eid." . trim($fieldname_evanced_id) . "_value = :evanced_id ";
 
     // Run the query.
     $result = db_query($sql, array(':bundle' => trim($main_config_settings[0]->content_type_name),
@@ -707,7 +707,7 @@ function evanced_events_importer_parse_xml() {
   $user = user_load(trim($main_config_settings[0]->publisher_uid));
 
   // Ensure an XML feed url has been specified before continuing.
-  if (trim($main_config_settings[0]->exml_feed_url) != '') {
+  if ((count($main_config_settings) > 0) && (trim($main_config_settings[0]->exml_feed_url) != '')) {
 
     // Initialize the XML parser (Document Object Model (DOM) library).
     $doc = new DOMDocument();
@@ -803,4 +803,4 @@ function evanced_events_importer_parse_xml() {
   // Reinstate the original session data.
   drupal_save_session($session_original);
 
-}
\ No newline at end of file
+}