From b32436cd2ea1f206cf5758170172f46dafb1f43c Mon Sep 17 00:00:00 2001
From: Solomon Hykes <solomon@dotcloud.com>
Date: Sat, 23 Mar 2013 19:51:35 -0700
Subject: [PATCH] Prevent container.Kill() from crashing if container.cmd is
 nil

---
 container.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/container.go b/container.go
index f900599d00..bd5e10ac5b 100644
--- a/container.go
+++ b/container.go
@@ -356,6 +356,9 @@ func (container *Container) monitor() {
 }
 
 func (container *Container) kill() error {
+	if container.cmd == nil {
+		return nil
+	}
 	if err := container.cmd.Process.Kill(); err != nil {
 		return err
 	}