Index: prepopulate.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/prepopulate/prepopulate.module,v
retrieving revision 1.4
diff -u -F^f -r1.4 prepopulate.module
--- prepopulate.module	28 Aug 2006 22:43:44 -0000	1.4
+++ prepopulate.module	29 Aug 2006 20:36:54 -0000
@@ -34,7 +34,9 @@ function prepopulate_form_alter($form_id
 
   if (variable_get('prepopulate_allowed_' . $type, TRUE) && $_GET['edit']) {
     foreach (array_keys( (array) $_GET['edit']) as $getvar) {
-      _prepopulate_get_walk($form[$getvar], $_GET['edit'][$getvar]);
+      if (element_child($getvar) && !is_null($form[$getvar])) {
+        _prepopulate_get_walk($form[$getvar], $_GET['edit'][$getvar]);
+      }
     } // endforeach get variable
   } // endif any get vars
 } // endfunction prepopulate_form_alter()
@@ -45,7 +47,7 @@ function _prepopulate_get_walk(&$form, &
   } 
   else {
     foreach (array_keys($getslice) as $getvar) {
-      if (is_array($form) && !is_null($form[$getvar])) {
+      if (element_child($getvar) && is_array($form) && !is_null($form[$getvar])) {
         _prepopulate_get_walk($form[$getvar], $getslice[$getvar]);
       }
     } // endforeach walking through get