--- location.module.orig	2010-04-09 01:11:14.211671813 -0400
+++ location.module	2010-04-09 01:11:45.161606063 -0400
@@ -1406,6 +1406,9 @@ function location_empty_location($settin
   $defaults = location_invoke_locationapi($location, 'defaults');
   if (isset($settings['form']['fields'])) {
     foreach ($settings['form']['fields'] as $k => $v) {
+      if (!isset($defaults[$k])) {
+        $defaults[$k] = array();
+      }
       $defaults[$k] = array_merge($defaults[$k], $v);
     }
   }