diff --git a/checkin_notes b/checkin_notes
index 04b3fc47e8..144ab2c1d5 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -2792,3 +2792,11 @@ David  5 May 2011
 
 	html/inc/
 		util.inc
+
+David  5 May 2011
+    - web: don't error out on old-style notice URL
+
+    sched/
+        validator.cpp
+    html/user/
+        friend.php
diff --git a/html/user/friend.php b/html/user/friend.php
index 0df36542bd..e074ae503a 100644
--- a/html/user/friend.php
+++ b/html/user/friend.php
@@ -121,7 +121,7 @@ function handle_add_confirm($user) {
 //
 function handle_query($user) {
     $target_userid = get_int('target_userid', true);
-    if ($target_userid != $user->id) {
+    if ($target_user && $target_userid != $user->id) {
         $target_user = BoincUser::lookup_id($target_userid);
         page_head(tra("Please log in as %1", $target_user->name));
         echo tra("You must log in as %1 to view this friend request",
diff --git a/sched/validator.cpp b/sched/validator.cpp
index ceb9e91cad..6e0d3dabbc 100644
--- a/sched/validator.cpp
+++ b/sched/validator.cpp
@@ -646,7 +646,7 @@ int main(int argc, char** argv) {
     int i, retval;
 
     const char *usage = 
-      "\nUsage: %s -app <app-name> [OPTIONS]\n"
+      "\nUsage: %s --app <app-name> [OPTIONS]\n"
       "Start validator for application <app-name>\n\n"
       "Optional arguments:\n"
       "  --one_pass_N_WU N       Validate at most N WUs, then exit\n"