diff --git a/process/handlers.go b/process/handlers.go
index 972d9c0..79e46c9 100644
--- a/process/handlers.go
+++ b/process/handlers.go
@@ -96,20 +96,20 @@ func (a *Server) instanceHandler(c echo.Context) error {
 	tu := c.Param("uuid")
 	u, err := uuid.Parse(tu)
 	if err != nil {
-		return c.String(http.StatusNotFound, "404 not found")
+		return a.notFoundHandler(c)
 	}
 
 	tc := pongo2.Context{}
 	instances := a.feta.manager.ListInstances()
+	found := false
 	for _, item := range instances {
 		if item.UUID == u {
 			tc["instance"] = item
+			found = true
 		}
 	}
 
-	_, exists := tc["instance"]
-
-	if !exists {
+	if !found {
 		return a.notFoundHandler(c)
 	}