Index: location.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/location/location.module,v
retrieving revision 1.222.2.20
diff -u -p -r1.222.2.20 location.module
--- location.module	3 Mar 2009 20:07:19 -0000	1.222.2.20
+++ location.module	19 Jan 2010 01:41:45 -0000
@@ -1437,12 +1437,14 @@ function template_preprocess_location(&$
   $location = $variables['location'];
   // This will get taken back out if map links are hidden.
   $location['map_link'] = TRUE;
-  foreach($variables['hide'] as $key) {
-    unset($location[$key]);
-    // Special case for coords.
-    if ($key == 'coords') {
-      unset($location['latitude']);
-      unset($location['longitude']);
+  if(!empty($variables['hide'])){
+    foreach($variables['hide'] as $key) {
+      unset($location[$key]);
+      // Special case for coords.
+      if ($key == 'coords') {
+        unset($location['latitude']);
+        unset($location['longitude']);
+      }
     }
   }
 
Index: contrib/location_cck/location_cck.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/location/contrib/location_cck/location_cck.module,v
retrieving revision 1.5.2.9
diff -u -p -r1.5.2.9 location_cck.module
--- contrib/location_cck/location_cck.module	25 Feb 2009 17:42:14 -0000	1.5.2.9
+++ contrib/location_cck/location_cck.module	19 Jan 2010 01:41:45 -0000
@@ -382,7 +382,10 @@ function location_cck_token_values($type
   if ($type == 'field') {
     $item = $object[0];
     $location = array(
-      'hide' => array_keys(array_filter($item['location_settings']['display']['hide'])),
+      'hide' => empty($item['location_settings']['display']['hide'])?
+          array():
+          array_keys(array_filter($item['location_settings']['display']['hide'])
+        ),
       'location' => location_load_location($item['lid']),
     );