diff --git a/src/recur.cpp b/src/recur.cpp
index 2ff9462f6..f2f9c235f 100644
--- a/src/recur.cpp
+++ b/src/recur.cpp
@@ -72,9 +72,7 @@ void handleRecurrence ()
       std::vector <Date> due;
       if (!generateDueDates (*t, due))
       {
-        std::cout << "Task "
-                  << t->get ("uuid")
-                  << " ("
+        std::cout << "Task ("
                   << trim (t->get ("description"))
                   << ") has past its 'until' date, and has been deleted."
                   << std::endl;
diff --git a/src/tests/recur.until.t b/src/tests/recur.until.t
new file mode 100755
index 000000000..1e20d3853
--- /dev/null
+++ b/src/tests/recur.until.t
@@ -0,0 +1,69 @@
+#! /usr/bin/perl
+################################################################################
+## taskwarrior - a command line task list manager.
+##
+## Copyright 2006 - 2010, Paul Beckingham.
+## All rights reserved.
+##
+## This program is free software; you can redistribute it and/or modify it under
+## the terms of the GNU General Public License as published by the Free Software
+## Foundation; either version 2 of the License, or (at your option) any later
+## version.
+##
+## This program is distributed in the hope that it will be useful, but WITHOUT
+## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+## FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+## details.
+##
+## You should have received a copy of the GNU General Public License along with
+## this program; if not, write to the
+##
+##     Free Software Foundation, Inc.,
+##     51 Franklin Street, Fifth Floor,
+##     Boston, MA
+##     02110-1301
+##     USA
+##
+################################################################################
+
+use strict;
+use warnings;
+use Test::More tests => 10;
+
+# Create the rc file.
+if (open my $fh, '>', 'recur.rc')
+{
+  print $fh "data.location=.\n";
+  close $fh;
+  ok (-r 'recur.rc', 'Created recur.rc');
+}
+
+# Create a few recurring tasks, and test the sort order of the recur column.
+qx{../task rc:recur.rc add foo due:now recur:2sec until:5sec};
+diag ("Sleeping for 6 seconds");
+sleep 6;
+my $output = qx{../task rc:recur.rc list};
+like ($output, qr/^\s+2/ms, 'Found 2');
+like ($output, qr/^\s+3/ms, 'Found 3');
+like ($output, qr/^\s+4/ms, 'Found 4');
+like ($output, qr/^\s+5/ms, 'Found 5');
+
+qx{../task rc:recur.rc do $_} for 2..6;
+$output = qx{../task rc:recur.rc list};
+like ($output, qr/and has been deleted/, 'Parent task deleted');
+
+# Cleanup.
+unlink 'pending.data';
+ok (!-r 'pending.data', 'Removed pending.data');
+
+unlink 'completed.data';
+ok (!-r 'completed.data', 'Removed completed.data');
+
+unlink 'undo.data';
+ok (!-r 'undo.data', 'Removed undo.data');
+
+unlink 'recur.rc';
+ok (!-r 'recur.rc', 'Removed recur.rc');
+
+exit 0;
+