diff --git a/www/showexp.php3 b/www/showexp.php3
index d988cdacc8be471b9af587c1b2649cdfe613b59a..b74cc02124510a3954f170b603842709750baaa1 100644
--- a/www/showexp.php3
+++ b/www/showexp.php3
@@ -535,7 +535,7 @@ if (isset($types['garcia']) ||
 		       ($expstate == $TB_EXPTSTATE_ACTIVE ?
 			"?pid=$exp_pid&eid=$exp_eid" : ""));
     if ($expstate == $TB_EXPTSTATE_SWAPPED) {
-	if ($types['static-mica2']) {
+	if (isset($types['static-mica2']) && $types['static-mica2']) {
 	    WRITESUBMENUBUTTON("Selector Applet",
 			       "robotrack/selector.php3?".
 			       "pid=$exp_pid&eid=$exp_eid");
diff --git a/www/wanodecheckin.php b/www/wanodecheckin.php
index 7dea719c4df3f5361b032b101d818488b0177000..e84e271d7c466cfe53f53bebfba2f36600f19d3f 100644
--- a/www/wanodecheckin.php
+++ b/www/wanodecheckin.php
@@ -1,7 +1,7 @@
 <?php
 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2007 University of Utah and the Flux Group.
+# Copyright (c) 2007, 2010 University of Utah and the Flux Group.
 # All rights reserved.
 #
 require("defs.php3");
@@ -53,7 +53,7 @@ if (!preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $IP) ||
 $query_result =
     DBQueryFatal("select IP from widearea_nodeinfo where privkey='$privkey'");
 if (! mysql_num_rows($query_result)) {
-    SPITSTATUS(WASTATUS_PRIVKEY);
+    SPITSTATUS(WASTATUS_BADPRIVKEY);
     return;
 }