diff --git a/debian/changelog b/debian/changelog
index ccc94c9..5560328 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+bsdgames (2.16-4) unstable; urgency=low
+
+  * Fixed a null pointer de-reference in hunt if run on a
+    system with an interface with no link level address. Closes: #279903
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 25 Nov 2004 11:23:09 -0500
+
 bsdgames (2.16-3) unstable; urgency=low
 
   * Add docdir to config.params and don't unstall trek.me manually.
diff --git a/hunt/hunt/hunt.c b/hunt/hunt/hunt.c
index f3be6a8..a094dd9 100644
--- a/hunt/hunt/hunt.c
+++ b/hunt/hunt/hunt.c
@@ -394,7 +394,8 @@ broadcast_vec(s, vector)
 
 	vec_cnt = 0;
 	for (ip = ifp; ip; ip = ip->ifa_next)
-		if ((ip->ifa_addr->sa_family == AF_INET) &&
+		if (ip->ifa_addr &&
+		    (ip->ifa_addr->sa_family == AF_INET) &&
 		    (ip->ifa_flags & IFF_BROADCAST))
 			vec_cnt++;
 
@@ -405,7 +406,8 @@ broadcast_vec(s, vector)
 
 	vec_cnt = 0;
 	for (ip = ifp; ip; ip = ip->ifa_next)
-		if ((ip->ifa_addr->sa_family == AF_INET) &&
+		if (ip->ifa_addr &&
+		    (ip->ifa_addr->sa_family == AF_INET) &&
 		    (ip->ifa_flags & IFF_BROADCAST))
 			memcpy(&(*vector)[vec_cnt++], ip->ifa_broadaddr,
 			       sizeof(struct sockaddr_in));