diff --git a/checkin_notes b/checkin_notes
index c64f22e89a..f46a9514a9 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -27387,3 +27387,11 @@ David  19 April 2005
     lib/
         gui_rpc_client.C
 
+Bruce 19 April 2005
+    - Better error reporting from problem_host.php reporting page, if
+      host does not exist.  Thanks to Christian Beer.
+
+    html/
+        ops/
+            problem_host.php
+
diff --git a/html/ops/problem_host.php b/html/ops/problem_host.php
index 1037723b20..dffe8b2a1b 100644
--- a/html/ops/problem_host.php
+++ b/html/ops/problem_host.php
@@ -31,15 +31,17 @@ if (!$hostid) {
     ";
 } else {
     $res = mysql_query("select * from host where id='$hostid'");
-    if (0) {
-      echo "No host with that ID";
-      exit;
-    }
     $host = mysql_fetch_object($res);
-    $res = mysql_query("select * from user where id='$host->userid'");
-    $user = mysql_fetch_object($res);
-    send_problem_email($user, $host);
-    echo "Email to ".$user->email_addr." has been send.";
+    if (!$host) {
+    	echo "<h2>No host with that ID</h2>
+	 	<center>Please <a href=\"problem_host.php\">try again</a></center>";
+    } else {
+    	$res = mysql_query("select * from user where id='$host->userid'");
+    	$user = mysql_fetch_object($res);
+    	send_problem_email($user, $host);
+    	echo "Email to ".$user->email_addr." has been send.<br>
+		<a href=\"problem_host.php\">Do another?</a>";
+	}
 }
 
 admin_page_tail();