Index: branches/stable/cgi-bin/extras/db2rwhois.pl
===================================================================
--- branches/stable/cgi-bin/extras/db2rwhois.pl	(revision 369)
+++ branches/stable/cgi-bin/extras/db2rwhois.pl	(revision 375)
@@ -281,11 +281,11 @@
 	"IP-Network: $net\n".
 	"IP-Network-Block: ".$net->range."\n".
-	"Org-Name: $name\n".
-	"Street-Address: $street\n".
-	"City: $city\n".
-	"StateProv: $prov\n".
-	"Postal-Code: $pocode\n".
-	"Country-Code: $country\n".
-	"Tech-Contact: $tech\n".
+	"Org-Name: ".($name ? $name : 'Friendly ISP')."\n".
+	"Street-Address: ".($street ? $street : '123 4th Street')."\n".
+	"City: ".($city ? $city : 'Anytown')."\n".
+	"StateProv: ".($prov ? $prov : 'Ontario')."\n".
+	"Postal-Code: ".($pocode ? $pocode : 'H0H 0H0')."\n".
+	"Country-Code: ".($country ? $country : 'CA')."\n".
+	"Tech-Contact: ".($tech ? $tech : 'ISP-ARIN-HANDLE')."\n".
 	"Created: $ctime\n".
 	"Updated: $mtime\n".