1 files changed, 12 insertions, 5 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go
index 330745314..872802016 100644
--- a/libpod/container_internal.go
+++ b/libpod/container_internal.go
@@ -211,6 +211,9 @@ func (c *Container) handleExitFile(exitFile string, fi os.FileInfo) error {
 
 	c.state.Exited = true
 
+	// Write an event for the container's death
+	c.newContainerExitedEvent(c.state.ExitCode)
+
 	return nil
 }
 
@@ -334,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)
@@ -948,6 +953,8 @@ func (c *Container) start() error {
 
 	c.state.State = ContainerStateRunning
 
+	defer c.newContainerEvent(events.Start)
+
 	return c.save()
 }