diff --git a/handlers/views_handler_filter.inc b/handlers/views_handler_filter.inc
index f5db70f..5db297e 100644
--- a/handlers/views_handler_filter.inc
+++ b/handlers/views_handler_filter.inc
@@ -947,7 +947,7 @@ class views_handler_filter extends views_handler {
           unset($row['value'][$children]['#dependency']['edit-options-operator']);
           $row['value'][$children]['#title'] = '';
 
-          if (!empty($this->options['group_info']['group_items'][$item_id]['value'][$children])) {
+          if (isset($this->options['group_info']['group_items'][$item_id]['value'][$children])) {
             $row['value'][$children]['#default_value'] = $this->options['group_info']['group_items'][$item_id]['value'][$children];
           }
         }
@@ -955,7 +955,7 @@ class views_handler_filter extends views_handler {
       }
 
       if ($without_children) {
-        if (!empty($this->options['group_info']['group_items'][$item_id]['value'])) {
+        if (isset($this->options['group_info']['group_items'][$item_id]['value'])) {
           $row['value']['#default_value'] = $this->options['group_info']['group_items'][$item_id]['value'];
         }
       }
diff --git a/tests/views_exposed_form.test b/tests/views_exposed_form.test
index 72baf2c..720caab 100644
--- a/tests/views_exposed_form.test
+++ b/tests/views_exposed_form.test
@@ -150,6 +150,19 @@ class ViewsExposedFormTest extends ViewsSqlTest {
     $this->drupalPost(NULL, $edit, t('Apply'));
     $this->assertRaw(t('The title is required if value for this item is defined.'), t('Group items should have a title'));
 
+    // Check that zero can be used as a value for a filter.
+    $this->drupalGet('admin/structure/views/nojs/config-item/test_exposed_admin_ui/default/filter/nid');
+    $edit = array();
+    $edit["options[group_info][group_items][1][title]"] = 'Zero';
+    $edit["options[group_info][group_items][1][value][value]"] = '0';
+
+    $this->drupalPost(NULL, $edit, t('Apply'));
+    $this->assertNoRaw(t('The value is required if title for this item is defined.'), 'Group items can be saved with a value of zero.');
+
+    // Check that zero can be retrieved as a value for a filter.
+    $this->drupalPost('admin/structure/views/nojs/config-item/test_exposed_admin_ui/default/filter/nid', array(), t('Apply'));
+    $this->assertNoRaw(t('The value is required if title for this item is defined.'), 'Group items can be retrieved with a value of zero.');
+
     // Un-Expose the filter
     $this->drupalGet('admin/structure/views/nojs/config-item/test_exposed_admin_ui/default/filter/type');
     $this->drupalPost(NULL, array(), t('Hide filter'));
diff --git a/tests/views_test.views_default.inc b/tests/views_test.views_default.inc
index 0448705..5b91f08 100644
--- a/tests/views_test.views_default.inc
+++ b/tests/views_test.views_default.inc
@@ -103,6 +103,18 @@ function views_test_views_default_views() {
   $handler->display->display_options['filters']['type']['expose']['operator_id'] = 'type_op';
   $handler->display->display_options['filters']['type']['expose']['label'] = 'Content: Type';
   $handler->display->display_options['filters']['type']['expose']['use_operator'] = TRUE;
+  /* Filter criterion: Content: Nid */
+  $handler->display->display_options['filters']['nid']['id'] = 'nid';
+  $handler->display->display_options['filters']['nid']['table'] = 'node';
+  $handler->display->display_options['filters']['nid']['field'] = 'nid';
+  $handler->display->display_options['filters']['nid']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['nid']['expose']['operator_id'] = 'nid_op';
+  $handler->display->display_options['filters']['nid']['expose']['label'] = 'Nid';
+  $handler->display->display_options['filters']['nid']['expose']['operator'] = 'nid_op';
+  $handler->display->display_options['filters']['nid']['expose']['identifier'] = 'nid';
+  $handler->display->display_options['filters']['nid']['is_grouped'] = TRUE;
+  $handler->display->display_options['filters']['nid']['group_info']['label'] = 'Nid';
+  $handler->display->display_options['filters']['nid']['group_info']['identifier'] = 'nid';
 
   /* Display: Page */
   $handler = $view->new_display('page', 'Page', 'page_1');