diff --git a/httpbin/handlers.go b/httpbin/handlers.go
index 6409930c219aac4cbb10731f09aa1f4a601a2fd4..1fe6b7e50fc9e87b788d5c87827de95d3081cc41 100644
--- a/httpbin/handlers.go
+++ b/httpbin/handlers.go
@@ -23,7 +23,8 @@ func notImplementedHandler(w http.ResponseWriter, r *http.Request) {
 // Index renders an HTML index page
 func (h *HTTPBin) Index(w http.ResponseWriter, r *http.Request) {
 	if r.URL.Path != "/" {
-		http.Error(w, "Not Found", http.StatusNotFound)
+		msg := fmt.Sprintf("Not Found (go-httpbin does not handle the path %s)", r.URL.Path)
+		http.Error(w, msg, http.StatusNotFound)
 		return
 	}
 	w.Header().Set("Content-Security-Policy", "default-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' camo.githubusercontent.com")
diff --git a/httpbin/handlers_test.go b/httpbin/handlers_test.go
index 2a346cd6554c2efafb5d7a345b528b49500f87cc..7c3064a7c4f9ea15f5538a59fe37d258263ff4b3 100644
--- a/httpbin/handlers_test.go
+++ b/httpbin/handlers_test.go
@@ -116,6 +116,7 @@ func TestIndex__NotFound(t *testing.T) {
 	w := httptest.NewRecorder()
 	app.ServeHTTP(w, r)
 	assertStatusCode(t, w, http.StatusNotFound)
+	assertBodyContains(t, w, "/foo")
 }
 
 func TestFormsPost(t *testing.T) {