diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index f74f37dfa2b4b67fcef1c09fa62e69e52bcc3ec8..7748f96e3a4f88df1690d11e01444640e20920a0 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,6 +4,8 @@ Date Module 6.x
 Version 6.2-dev
 =================
 
+Version 6.2.7
+=============
 - #514242 Day repeated every two weeks was broken by wrong day comparison value.
 - Fix a bug in the calculation of the week days when using ISO weeks.
 - #549042 The date_week() function should return an integer even when using ISO weeks.
diff --git a/includes/date_api_argument_handler.inc b/includes/date_api_argument_handler.inc
index 09b4123463f40f2a57ddb9b692181cb5ece9ff0a..7d2b4d167d46c488b95a60be10dc74668e538903 100644
--- a/includes/date_api_argument_handler.inc
+++ b/includes/date_api_argument_handler.inc
@@ -340,8 +340,9 @@ class date_api_argument_handler extends views_handler_argument_date {
     
     // See if we're outside the allowed date range for our argument.
     if (date_format($min_date, 'Y') < $this->view->date_info->min_allowed_year || date_format($max_date, 'Y') > $this->view->date_info->max_allowed_year) {
-      drupal_not_found();
-      exit;
+      $this->forbid = TRUE;
+      $this->query->add_where('date', "0=1");
+      return;
     }
     
     // The second option seems to work better in the block view if