1 files changed, 11 insertions, 5 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go
index bea7acd69..ac2d65342 100644
--- a/libpod/container_internal.go
+++ b/libpod/container_internal.go
@@ -337,11 +337,13 @@ func (c *Container) setupStorage(ctx context.Context) error {
 	}
 
 	// Set the default Entrypoint and Command
-	if c.config.Entrypoint == nil {
-		c.config.Entrypoint = containerInfo.Config.Config.Entrypoint
-	}
-	if c.config.Command == nil {
-		c.config.Command = containerInfo.Config.Config.Cmd
+	if containerInfo.Config != nil {
+		if c.config.Entrypoint == nil {
+			c.config.Entrypoint = containerInfo.Config.Config.Entrypoint
+		}
+		if c.config.Command == nil {
+			c.config.Command = containerInfo.Config.Config.Cmd
+		}
 	}
 
 	artifacts := filepath.Join(c.config.StaticDir, artifactsDir)
@@ -1427,5 +1429,9 @@ func (c *Container) copyWithTarFromImage(src, dest string) error {
 	}
 	a := archive.NewDefaultArchiver()
 	source := filepath.Join(mountpoint, src)
+
+	if err = c.copyOwnerAndPerms(source, dest); err != nil {
+		return err
+	}
 	return a.CopyWithTar(source, dest)
 }