diff --git a/mozilla/webtools/bugzilla/Bugzilla/Token.pm b/mozilla/webtools/bugzilla/Bugzilla/Token.pm
index 6dd8baa6ea5..f00e6528082 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Token.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Token.pm
@@ -310,7 +310,7 @@ sub _create_token {
     my ($userid, $tokentype, $eventdata) = @_;
     my $dbh = Bugzilla->dbh;
 
-    detaint_natural($userid);
+    detaint_natural($userid) if defined $userid;
     trick_taint($tokentype);
     trick_taint($eventdata);