diff --git a/html/inc/result.inc b/html/inc/result.inc
index 9d0109aed8..b6c9636ce8 100644
--- a/html/inc/result.inc
+++ b/html/inc/result.inc
@@ -82,6 +82,9 @@ function app_version_string($result) {
         return anon_platform_string($result, tra("Apple GPU"));
     }
     $av = get_app_version($id);
+    if (!$av) {
+        return "missing app version $id";
+    }
     $app = get_app($av->appid);
     $platform = get_platform($av->platformid);
     $n = $app->user_friendly_name;
diff --git a/tools/process_input_template.cpp b/tools/process_input_template.cpp
index d38f265b07..ba2ff8a9b7 100644
--- a/tools/process_input_template.cpp
+++ b/tools/process_input_template.cpp
@@ -468,8 +468,11 @@ static int process_workunit(
             }
             n_file_refs++;
         } else if (xp.parse_string("command_line", cmdline)) {
-            if (command_line) {
-                boinc::fprintf(stderr, "Can't specify command line twice\n");
+            if (strlen(command_line)) {
+                boinc::fprintf(stderr,
+                    "Can't specify command line %s; already specified as %s\n",
+                    cmdline.c_str(), command_line
+                );
                 return ERR_XML_PARSE;
             }
             out += "<command_line>\n";