diff --git a/PBot/AntiFlood.pm b/PBot/AntiFlood.pm
index bf67bf4b..11d97320 100644
--- a/PBot/AntiFlood.pm
+++ b/PBot/AntiFlood.pm
@@ -144,7 +144,7 @@ sub get_flood_account {
     if($mask =~ m/!\Q$user\E@\Q$host\E$/i) {
       $self->{pbot}->logger->log("anti-flood: [get-account] $nick!$user\@$host linked to $mask\n");
       $self->{message_history}->{"$nick!$user\@$host"} = $self->{message_history}->{$mask};
-      $self->check_nickserv_accounts($nick, $self->{message_history}->{$mask}->{nickserv_account});
+      $self->check_nickserv_accounts($nick, $self->{message_history}->{$mask}->{nickserv_account}) if defined $self->{message_history}->{$mask}->{nickserv_account};
       return "$nick!$user\@$host";
     }
   }
diff --git a/PBot/VERSION.pm b/PBot/VERSION.pm
index 6a284c4b..0b1beff3 100644
--- a/PBot/VERSION.pm
+++ b/PBot/VERSION.pm
@@ -13,7 +13,7 @@ use warnings;
 # These are set automatically by the build/commit script
 use constant {
   BUILD_NAME     => "PBot",
-  BUILD_REVISION => 336,
+  BUILD_REVISION => 337,
   BUILD_DATE     => "2011-12-12",
 };