diff --git a/PBot/Factoids.pm b/PBot/Factoids.pm
index a91c696b..effa405a 100644
--- a/PBot/Factoids.pm
+++ b/PBot/Factoids.pm
@@ -125,12 +125,14 @@ sub export_factoids {
   my $table_id = 1;
 
   foreach my $channel (sort keys %{ $self->factoids->hash }) {
+    next if not scalar keys %{ $self->factoids->hash->{$channel} };
     my $chan = $channel eq '.*' ? 'global' : $channel;
 
-    print FILE "<a href='#" . $chan . "'>$chan</a><br>\n";
+    print FILE "<a href='#" . $chan . "'>" . encode_entities($chan) . "</a><br>\n";
   }
 
   foreach my $channel (sort keys %{ $self->factoids->hash }) {
+    next if not scalar keys %{ $self->factoids->hash->{$channel} };
     my $chan = $channel eq '.*' ? 'global' : $channel;
     print FILE "<a name='$chan'></a>\n";
     print FILE "<hr>\n<h3>$chan</h3>\n<hr>\n";
diff --git a/PBot/VERSION.pm b/PBot/VERSION.pm
index 94572e13..ce684bf7 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 => 449,
+  BUILD_REVISION => 450,
   BUILD_DATE     => "2013-10-13",
 };