3 files changed, 30 insertions, 7 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go
index 0d0f700a6..9daac161c 100644
--- a/libpod/runtime_ctr.go
+++ b/libpod/runtime_ctr.go
@@ -132,6 +132,14 @@ func (r *Runtime) setupContainer(ctx context.Context, ctr *Container, restore bo
 	ctr.config.LockID = ctr.lock.ID()
 	logrus.Debugf("Allocated lock %d for container %s", ctr.lock.ID(), ctr.ID())
 
+	defer func() {
+		if err != nil {
+			if err2 := ctr.lock.Free(); err2 != nil {
+				logrus.Errorf("Error freeing lock for container after creation failed: %v", err2)
+			}
+		}
+	}()
+
 	ctr.valid = true
 	ctr.state.State = config2.ContainerStateConfigured
 	ctr.runtime = r
diff --git a/libpod/runtime_pod_linux.go b/libpod/runtime_pod_linux.go
index e9ce130da..d667d3a25 100644
--- a/libpod/runtime_pod_linux.go
+++ b/libpod/runtime_pod_linux.go
@@ -19,7 +19,7 @@ import (
 )
 
 // NewPod makes a new, empty pod
-func (r *Runtime) NewPod(ctx context.Context, options ...PodCreateOption) (*Pod, error) {
+func (r *Runtime) NewPod(ctx context.Context, options ...PodCreateOption) (_ *Pod, Err error) {
 	r.lock.Lock()
 	defer r.lock.Unlock()
 
@@ -60,6 +60,14 @@ func (r *Runtime) NewPod(ctx context.Context, options ...PodCreateOption) (*Pod,
 	pod.lock = lock
 	pod.config.LockID = pod.lock.ID()
 
+	defer func() {
+		if Err != nil {
+			if err := pod.lock.Free(); err != nil {
+				logrus.Errorf("Error freeing pod lock after failed creation: %v", err)
+			}
+		}
+	}()
+
 	pod.valid = true
 
 	// Check CGroup parent sanity, and set it if it was not set
@@ -113,15 +121,17 @@ func (r *Runtime) NewPod(ctx context.Context, options ...PodCreateOption) (*Pod,
 	if err := r.state.AddPod(pod); err != nil {
 		return nil, errors.Wrapf(err, "error adding pod to state")
 	}
+	defer func() {
+		if Err != nil {
+			if err := r.removePod(ctx, pod, true, true); err != nil {
+				logrus.Errorf("Error removing pod after pause container creation failure: %v", err)
+			}
+		}
+	}()
 
 	if pod.HasInfraContainer() {
 		ctr, err := r.createInfraContainer(ctx, pod)
 		if err != nil {
-			// Tear down pod, as it is assumed a the pod will contain
-			// a pause container, and it does not.
-			if err2 := r.removePod(ctx, pod, true, true); err2 != nil {
-				logrus.Errorf("Error removing pod after pause container creation failure: %v", err2)
-			}
 			return nil, errors.Wrapf(err, "error adding Infra Container")
 		}
 		pod.state.InfraContainerID = ctr.ID()
diff --git a/libpod/stats.go b/libpod/stats.go
index da383e9d9..eb5ed95c4 100644
--- a/libpod/stats.go
+++ b/libpod/stats.go
@@ -3,6 +3,7 @@
 package libpod
 
 import (
+	"runtime"
 	"strings"
 	"syscall"
 	"time"
@@ -105,7 +106,11 @@ func calculateCPUPercent(stats *cgroups.Metrics, previousCPU, previousSystem uin
 	if systemDelta > 0.0 && cpuDelta > 0.0 {
 		// gets a ratio of container cpu usage total, multiplies it by the number of cores (4 cores running
 		// at 100% utilization should be 400% utilization), and multiplies that by 100 to get a percentage
-		cpuPercent = (cpuDelta / systemDelta) * float64(len(stats.CPU.Usage.PerCPU)) * 100
+		nCPUS := len(stats.CPU.Usage.PerCPU)
+		if nCPUS == 0 {
+			nCPUS = runtime.NumCPU()
+		}
+		cpuPercent = (cpuDelta / systemDelta) * float64(nCPUS) * 100
 	}
 	return cpuPercent
 }