diff --git a/www/editnodetype.php3 b/www/editnodetype.php3
index cc18d60319b80be7edb2c5088aac3c48601c9bb1..86ec493072137409661ee76d0ca08234f1e2e9ba 100644
--- a/www/editnodetype.php3
+++ b/www/editnodetype.php3
@@ -49,6 +49,12 @@ $rhl_std = OSinfo::LookupByName($emulab_ops, "RHL-STD");
 $fbsd_std = OSinfo::LookupByName($emulab_ops,"FBSD-STD");
 $frisbee_mfs = OSinfo::LookupByName($emulab_ops,"FRISBEE-MFS");
 
+if ($freebsd_mfs == null || $fbsd410_rhl90_std == null ||
+    $rhl_std == null || $fbsd_std == null || $frisbee_mfs == null) {
+    PAGEERROR("You must add images from Utah into your database" .
+              " before adding a nodetype. See installation documentation for details!",1);
+}
+
 # This belongs elsewhere!
 $initial_attributes = array(
     array("attrkey" => "adminmfs_osid", "attrvalue" => $freebsd_mfs->osid(),
diff --git a/www/joinproject.php3 b/www/joinproject.php3
index dec445ced582630364f0f39bb40f6d9875787198..f2887f8b3a4aa4951f42154c5c752ab504af44f5 100644
--- a/www/joinproject.php3
+++ b/www/joinproject.php3
@@ -759,7 +759,9 @@ if (! $returning) {
     $args["affiliation"]   = $formfields["usr_affil"];
     $args["affiliation_abbreviation"] = $formfields["usr_affil_abbrev"];
     $args["password"]      = $formfields["password1"];
-    $args["wikiname"]      = ($WIKISUPPORT ? $formfields["wikiname"] : "");
+    if ($WIKISUPPORT) {
+        $args["wikiname"] = $formfields["wikiname"];
+    }
 
     if (isset($formfields["usr_URL"]) &&
 	$formfields["usr_URL"] != $HTTPTAG && $formfields["usr_URL"] != "") {
diff --git a/www/newproject.php3 b/www/newproject.php3
index cee38c77080b24ca3d0295e1b55f7b69d4ffbc4d..eaa5a0e00ae2d778c71cb2f22018537826f4d00b 100755
--- a/www/newproject.php3
+++ b/www/newproject.php3
@@ -925,7 +925,10 @@ if (!$returning) {
     $args["affiliation"]   = $formfields["usr_affil"];
     $args["affiliation_abbreviation"] = $formfields["usr_affil_abbrev"];
     $args["password"]      = $formfields["password1"];
-    $args["wikiname"]      = ($WIKISUPPORT ? $formfields["wikiname"] : "");
+    if ($WIKISUPPORT) {
+        $args["wikiname"] = $formfields["wikiname"];
+    }
+
 
     if (isset($formfields["usr_URL"]) &&
 	$formfields["usr_URL"] != $HTTPTAG && $formfields["usr_URL"] != "") {