3 files changed, 16 insertions, 10 deletions
diff --git a/pkg/api/handlers/libpod/images.go b/pkg/api/handlers/libpod/images.go
index 598a46abe..55264b3b6 100644
--- a/pkg/api/handlers/libpod/images.go
+++ b/pkg/api/handlers/libpod/images.go
@@ -44,11 +44,16 @@ func ImageExists(w http.ResponseWriter, r *http.Request) {
 	runtime := r.Context().Value("runtime").(*libpod.Runtime)
 	name := utils.GetName(r)
 
-	_, err := runtime.ImageRuntime().NewFromLocal(name)
+	ir := abi.ImageEngine{Libpod: runtime}
+	report, err := ir.Exists(r.Context(), name)
 	if err != nil {
 		utils.Error(w, "Something went wrong.", http.StatusNotFound, errors.Wrapf(err, "failed to find image %s", name))
 		return
 	}
+	if !report.Value {
+		utils.Error(w, "Something went wrong.", http.StatusNotFound, errors.Wrapf(nil, "failed to find image %s", name))
+		return
+	}
 	utils.WriteResponse(w, http.StatusNoContent, "")
 }
 
diff --git a/pkg/api/handlers/libpod/networks.go b/pkg/api/handlers/libpod/networks.go
index b7e2b3988..9f6103c45 100644
--- a/pkg/api/handlers/libpod/networks.go
+++ b/pkg/api/handlers/libpod/networks.go
@@ -113,15 +113,15 @@ func InspectNetwork(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	name := utils.GetName(r)
-	options := entities.NetworkInspectOptions{}
+	options := entities.InspectOptions{}
 	ic := abi.ContainerEngine{Libpod: runtime}
-	reports, err := ic.NetworkInspect(r.Context(), []string{name}, options)
+	reports, errs, err := ic.NetworkInspect(r.Context(), []string{name}, options)
+	// If the network cannot be found, we return a 404.
+	if len(errs) > 0 {
+		utils.Error(w, "Something went wrong", http.StatusNotFound, define.ErrNoSuchNetwork)
+		return
+	}
 	if err != nil {
-		// If the network cannot be found, we return a 404.
-		if errors.Cause(err) == define.ErrNoSuchNetwork {
-			utils.Error(w, "Something went wrong", http.StatusNotFound, err)
-			return
-		}
 		utils.InternalServerError(w, err)
 		return
 	}
diff --git a/pkg/api/server/idle/tracker.go b/pkg/api/server/idle/tracker.go
index 50e41b7bf..687ebd7d4 100644
--- a/pkg/api/server/idle/tracker.go
+++ b/pkg/api/server/idle/tracker.go
@@ -41,11 +41,12 @@ func (t *Tracker) ConnState(conn net.Conn, state http.ConnState) {
 
 	logrus.Debugf("IdleTracker %p:%v %dm+%dh/%dt connection(s)", conn, state, len(t.managed), t.hijacked, t.TotalConnections())
 	switch state {
-	case http.StateNew, http.StateActive:
+	case http.StateNew:
+		t.total++
+	case http.StateActive:
 		// stop the API timer when the server transitions any connection to an "active" state
 		t.managed[conn] = struct{}{}
 		t.timer.Stop()
-		t.total++
 	case http.StateHijacked:
 		// hijacked connections should call Close() when finished.
 		// Note: If a handler hijack's a connection and then doesn't Close() it,