diff --git a/tsweb/tsweb_test.go b/tsweb/tsweb_test.go
index 4c4de4550..6fa3ac2bf 100644
--- a/tsweb/tsweb_test.go
+++ b/tsweb/tsweb_test.go
@@ -121,6 +121,22 @@ func TestStdHandler(t *testing.T) {
 			},
 		},
 
+		{
+			name:     "handler returns 404 with nil child error",
+			h:        handlerErr(0, Error(404, "not found", nil)),
+			r:        req(bgCtx, "http://example.com/foo"),
+			wantCode: 404,
+			wantLog: AccessLogRecord{
+				When:       clock.Start,
+				Seconds:    1.0,
+				Proto:      "HTTP/1.1",
+				Host:       "example.com",
+				Method:     "GET",
+				RequestURI: "/foo",
+				Code:       404,
+			},
+		},
+
 		{
 			name:     "handler returns generic error",
 			h:        handlerErr(0, testErr),