diff --git a/src/@dates/remove.m b/src/@dates/remove.m
index 721dbb7596941811dc71d1a8ad64108c7b3933ac..a9aa381e332720ec5afcc5d9c52284030986a53d 100644
--- a/src/@dates/remove.m
+++ b/src/@dates/remove.m
@@ -53,11 +53,19 @@ o.remove_(p);
 %$ g = copy(d);
 %$
 %$ % Call the tested routine.
-%$ c = d.remove(e);
+%$ try
+%$     c = d.remove(e);
+%$     t(1) = true;
+%$ catch
+%$     t(1) = false;
+%$ end
 %$ 
 %$ % Check the results.
-%$ t(1) = dassert(c,f);
-%$ t(2) = dassert(d,g);
+%$ if t(1)
+%$     t(2) = dassert(c,f);
+%$     t(3) = dassert(d,g);
+%$ end
+%$
 %$ T = all(t);
 %@eof:1
 
@@ -68,9 +76,17 @@ o.remove_(p);
 %$ f = dates('1950Q2');
 %$
 %$ % Call the tested routine.
-%$ c = d.remove(e);
+%$ try
+%$     c = d.remove(e);
+%$     t(1) = true;
+%$ catch
+%$     t(1) = false;
+%$ end
 %$
 %$ % Check the results.
-%$ t(1) = dassert(c,f);
+%$ if t(1)
+%$     t(2) = dassert(c,f);
+%$ end
+%$
 %$ T = all(t);
 %@eof:2
diff --git a/src/@dates/remove_.m b/src/@dates/remove_.m
index 7fd5c779b071041c66919082d852d437a2129a3a..94a456b66fae41e4e32a3edd0958d01adde14f50 100644
--- a/src/@dates/remove_.m
+++ b/src/@dates/remove_.m
@@ -57,10 +57,18 @@ o.time = time;
 %$ f = dates('1950Q1'):dates('1950Q4');
 %$
 %$ % Call the tested routine.
-%$ d.remove_(e);
+%$ try
+%$     d.remove_(e);
+%$     t(1) = true;
+%$ catch
+%$     t(1) = false;
+%$ end
 %$
 %$ % Check the results.
-%$ t(1) = dassert(d,f);
+%$ if t(1)
+%$     t(2) = dassert(d,f);
+%$ end
+%$
 %$ T = all(t);
 %@eof:1
 
@@ -71,9 +79,17 @@ o.time = time;
 %$ f = dates('1950Q2');
 %$
 %$ % Call the tested routine.
-%$ d.remove_(e);
+%$ try
+%$     d.remove_(e);
+%$     t(1) = true;
+%$ catch
+%$     t(1) = false;
+%$ end
 %$
 %$ % Check the results.
-%$ t(1) = dassert(d,f);
+%$ if t(1)
+%$     t(2) = dassert(d,f);
+%$ end
+%$
 %$ T = all(t);
 %@eof:2
\ No newline at end of file