Index: webform.module
===================================================================
--- webform.module	(revision 2269)
+++ webform.module	(working copy)
@@ -2608,14 +2608,15 @@
 
   if (is_array($fieldset)) {
     foreach ($fieldset as $form_key => $value) {
-      $cid = webform_get_cid($node, $form_key, $parent);
+      if ($cid = webform_get_cid($node, $form_key, $parent)) {
 
-      if (is_array($value) && webform_component_feature($node->webform['components'][$cid]['type'], 'group')) {
-        $values += _webform_client_form_submit_flatten($node, $value, $cid);
+          if (is_array($value) && webform_component_feature($node->webform['components'][$cid]['type'], 'group')) {
+            $values += _webform_client_form_submit_flatten($node, $value, $cid);
+          }
+          else {
+            $values[$cid] = $value;
+         }
       }
-      else {
-        $values[$cid] = $value;
-      }
     }
   }