diff --git a/image/image.go b/image/image.go
index e7ddd54..2955a14 100644
--- a/image/image.go
+++ b/image/image.go
@@ -301,6 +301,13 @@ func createBundle(w walker, m *manifest, dest, rootfs string) error {
 			if err2 := os.MkdirAll(dest, 0755); err2 != nil {
 				return err2
 			}
+			defer func() {
+				if err != nil {
+					if err3 := os.RemoveAll(dest); err3 != nil {
+						fmt.Printf("warning: failed to clean up %q\n", dest)
+					}
+				}
+			}()
 		} else {
 			return err
 		}