--- ./sites/all/modules/node_import/supported/location.inc	2007-07-26 10:17:19.000000000 +0300
+++ ./sites/all/modules/node_import/supported/location.inc.new	2007-07-26 10:21:15.000000000 +0300
@@ -84,20 +84,26 @@ function location_node_import_prepare(&$
     }
   }
 
-  // Validate submitted latitude/longitude (see location_nodeapi('validate')).
-  if (user_access('submit latitude/longitude')) {
-    if (strlen($location['latitude']) * strlen($location['longitude']) == 0) {
-      $errors[] = t('You must fill in both latitude and longitude or leave them both blank.');
-    }
-    else {
-      if (!is_numeric($location['latitude']) || $location['latitude'] > 90.0 || $location['latitude'] < -90.0) {
-        $errors[] = t('The latitude must be a numeric value between -90.0 and 90.0.');
-      }
-      if (!is_numeric($location['longitude']) || $location['longitude'] > 180.0 || $location['longitude'] < -180.0) {
-        $errors[] = t('The longitude must be a numeric value between -180.0 and 180.0.');
-      }
-    }
-  }
+	// Validate submitted latitude/longitude (see location_nodeapi('validate')).
+	if (user_access('submit latitude/longitude')) {
+		// check if both fields are empty. if so, we're OK to continue. if not, continue checking:
+		if ( (strlen($location['latitude']) === 0) && (strlen($location['longitude']) === 0) ) {
+			// all ok... .
+		}
+		else {
+			// some values are inside longitude or latitude - continue validating.
+			// Check if one of the lon-lat values is zero:
+			if (strlen($location['latitude']) * strlen($location['longitude']) == 0) {
+				$errors[] = t('You must fill in both latitude and longitude or leave them both blank.');
+			}
+			if (!is_numeric($location['latitude']) || $location['latitude'] > 90.0 || $location['latitude'] < -90.0) {
+				$errors[] = t('The latitude must be a numeric value between -90.0 and 90.0.');
+			}
+			if (!is_numeric($location['longitude']) || $location['longitude'] > 180.0 || $location['longitude'] < -180.0) {
+				$errors[] = t('The longitude must be a numeric value between -180.0 and 180.0.');
+			}
+		}
+	}
 
   /* TODO: must add this back later