--- cmf.module	2010-11-12 18:36:59.000000000 +0000
+++ cmf.module	2010-11-13 10:07:30.000000000 +0000
@@ -571,13 +571,13 @@ function _cmf_contains_validate($form) {
     // Strip blanks to see if the field is empty.
     $value = trim($form['#value']);
     if (empty($value)) {
-      form_error($form, t('This value may not be empty.'));
+      form_error($form, t('%name text value may not be empty.', array('%name' => $form['#name'])));
     }
   }
 }
 
 /**
- * Validation handler for filter doing "contains".
+ * Validation handler for filter doing "dates".
  */
 function _cmf_date_validate($form) {
   // Make sure this was triggered by the selected filter.
@@ -596,8 +596,8 @@ function _cmf_date_validate($form) {
 // drupal_set_message('_cmf_date_validate, filter='.$form['#post']['filter'].', name='.$form['#name'].' '.print_r($form['#value'], true).', calc='.format_date($entered_date));
 // drupal_set_message('current filters='.print_r($_SESSION['cmf_overview_filter'], true));
 
-  if (empty($value)) {
-    form_error($form, t('This value may not be empty.'));
+  if (empty($entered_date)) {
+    form_error($form, t('%name date value may not be empty.', array('%name' => $form['#name'])));
   }
 }