diff --git a/Changes b/Changes
index 00f6caa..a104d63 100644
--- a/Changes
+++ b/Changes
@@ -2,6 +2,9 @@
 
   [ many changes from cvs logs, gah ]
 
+  Fix warning in count_unrecognized_commands plugin (thanks to spaze
+  and Roger Walker)
+
   Improve error messages from the Postfix module (Erik I. Bolsų,
   <knan at mo.himolde.no>)
 
diff --git a/plugins/count_unrecognized_commands b/plugins/count_unrecognized_commands
index ac27466..7033f6b 100644
--- a/plugins/count_unrecognized_commands
+++ b/plugins/count_unrecognized_commands
@@ -36,7 +36,7 @@ sub check_unrec_cmd {
 
   my $badcmdcount = 
     $self->qp->connection->notes('unrec_cmd_count',
-				 $self->qp->connection->notes('unrec_cmd_count') + 1
+				 ($self->qp->connection->notes('unrec_cmd_count') || 0) + 1
 				);
 
   if ($badcmdcount >= $self->{_unrec_cmd_max}) {