Index: /trunk/cgi-bin/main.cgi
===================================================================
--- /trunk/cgi-bin/main.cgi	(revision 664)
+++ /trunk/cgi-bin/main.cgi	(revision 665)
@@ -388,4 +388,7 @@
   return if !validateInput();
 
+  # make sure this is defined
+  $webvar{fbassign} = 'n' if !$webvar{fbassign};
+
 # Several different cases here.
 # Static IP vs netblock
@@ -394,4 +397,8 @@
 
   if ($webvar{alloctype} =~ /^.i$/ && $webvar{fbassign} ne 'y') {
+    if (!$webvar{pop}) {
+      $page->param(err => "Please select a location/POP site to allocate from.");
+      return;
+    }
     my $plist = getPoolSelect($ip_dbh, $webvar{alloctype}, $webvar{pop});
     $page->param(staticip => 1);