From 5f8e24f8428bc5fb7076ec757ded44f965c48888 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Mon, 9 Sep 2013 14:18:20 +0200
Subject: [PATCH] Runtime: Only remove device on destroy if it exists

---
 runtime.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime.go b/runtime.go
index 2b776a5e0..3bbed7529 100644
--- a/runtime.go
+++ b/runtime.go
@@ -288,7 +288,7 @@ func (runtime *Runtime) Destroy(container *Container) error {
 	if err := os.RemoveAll(container.root); err != nil {
 		return fmt.Errorf("Unable to remove filesystem for %v: %v", container.ID, err)
 	}
-	if runtime.GetMountMethod() == MountMethodDeviceMapper {
+	if runtime.GetMountMethod() == MountMethodDeviceMapper && runtime.deviceSet.HasDevice(container.ID) {
 		if err := runtime.deviceSet.RemoveDevice(container.ID); err != nil {
 			return fmt.Errorf("Unable to remove device for %v: %v", container.ID, err)
 		}