diff -rupN content_distribution/modules/content_retriever/content_retriever.admin.inc content_distribution_new/modules/content_retriever/content_retriever.admin.inc
--- content_distribution/modules/content_retriever/content_retriever.admin.inc	2010-02-15 09:20:03.000000000 +1100
+++ modules/content_retriever/content_retriever.admin.inc	2010-06-11 16:50:50.000000000 +1000
@@ -334,15 +334,17 @@ function content_retriever_admin_view_ar
 function content_retriever_admin_view_arguments_form_submit($form, &$form_state) {
   // Filter out 0 values in checkboxes so they don't get saved and later passed
   // as arguments to the view.
-  foreach ($form_state['values']['view_arguments'] as $id => $value) {
-    if (is_array($value)) {
-      $form_state['values']['view_arguments'][$id] = array_filter($value);
+  if (isset($form_state['values']['view_arguments'])) {
+    foreach ($form_state['values']['view_arguments'] as $id => $value) {
+      if (is_array($value)) {
+        $form_state['values']['view_arguments'][$id] = array_filter($value);
+      }
     }
   }
-  
+
   // This stores the whole array of values, keyed by argument id.
-  variable_set('content_retriever_view_arguments', $form_state['values']['view_arguments']);
-  
+  variable_set('content_retriever_view_arguments', isset($form_state['values']['view_arguments']) ? $form_state['values']['view_arguments'] : array());
+
   drupal_set_message(t('The argument settings have been saved.'));
 }