diff --git a/bind8/conf_net.cgi b/bind8/conf_net.cgi
index 5d5071bb1..a7a2dea1b 100755
--- a/bind8/conf_net.cgi
+++ b/bind8/conf_net.cgi
@@ -52,7 +52,7 @@ print &ui_table_row($text{'net_listen'}, $ltable, 3);
 
 # Source address for queries
 my $src = &find("query-source", $mems);
-my $srcstr = join(" ", $src->{'values'});
+my $srcstr = $src ? join(" ", @{$src->{'values'}}) : "";
 my ($sport, $saddr);
 $sport = $1 if ($srcstr =~ /port\s+(\d+)/i);
 $saddr = $1 if ($srcstr =~ /address\s+([0-9\.]+)/i);
diff --git a/os_list.txt b/os_list.txt
index c794a5068..a526f1acf 100644
--- a/os_list.txt
+++ b/os_list.txt
@@ -105,6 +105,7 @@ Xandros Linux			$1	debian-linux	3.2	$etc_issue =~ /Xandros.*\s(4\.\d+)/i
 APLINUX				1.3	debian-linux	3.1	$etc_issue =~ /APLINUX.*1\.3/i
 BigBlock			$1	suse-linux	8.2	`cat /etc/bigblock-revision 2>/dev/null` =~ /Version:\s(1[0-9\.-]+)\s/i
 BigBlock			$1	debian-linux	3.0	`cat /etc/bigblock-revision 2>/dev/null` =~ /Version:\s(2[0-9\.-]+)\s/i
+Pop!OS				$1	debian-linux	13.0	$os_release =~ /Pop!OS\s+(22\.[0-9\.]+)/
 Ubuntu Linux			$1	debian-linux	4.0	$etc_issue =~ /Ubuntu.*\sgutsy/i
 Ubuntu Linux			$1	debian-linux	4.0	$etc_issue =~ /Ubuntu.*\s(7\.[0-9\.]+)\s/i
 Ubuntu Linux			$1	debian-linux	4.0	$etc_issue =~ /Ubuntu.*\s(8\.[0-9\.]+)\s/i