postgres-ai
diff --git a/‎internal/cloning/base.go
Copy file name to clipboardExpand all lines: internal/cloning/base.go
+4-1Lines changed: 4 additions & 1 deletion b/‎internal/cloning/base.go
Copy file name to clipboardExpand all lines: internal/cloning/base.go
+4-1Lines changed: 4 additions & 1 deletion
diff --git a/‎internal/cloning/snapshots.go
Copy file name to clipboardExpand all lines: internal/cloning/snapshots.go
+2-1Lines changed: 2 additions & 1 deletion b/‎internal/cloning/snapshots.go
Copy file name to clipboardExpand all lines: internal/cloning/snapshots.go
+2-1Lines changed: 2 additions & 1 deletion
diff --git a/‎internal/cloning/storage.go
Copy file name to clipboardExpand all lines: internal/cloning/storage.go
+4-1Lines changed: 4 additions & 1 deletion b/‎internal/cloning/storage.go
Copy file name to clipboardExpand all lines: internal/cloning/storage.go
+4-1Lines changed: 4 additions & 1 deletion
@@ -306,7 +306,10 @@ func (c *Base) DestroyClone(cloneID string) error {
 		}
 
 		c.deleteClone(cloneID)
-		c.decrementCloneNumber(w.Clone.Snapshot.ID)
+
+		if w.Clone.Snapshot != nil {
+			c.decrementCloneNumber(w.Clone.Snapshot.ID)
+		}
 		c.observingCh <- cloneID
 
 		c.SaveClonesState()
 
@@ -34,7 +34,8 @@ func (c *Base) fetchSnapshots() error {
 		numClones := 0
 
 		for cloneName := range c.clones {
-			if c.clones[cloneName] != nil && c.clones[cloneName].Clone.Snapshot.ID == entry.ID {
+			if c.clones[cloneName] != nil && c.clones[cloneName].Clone.Snapshot != nil &&
+				c.clones[cloneName].Clone.Snapshot.ID == entry.ID {
 				numClones++
 			}
 		}
 
@@ -62,10 +62,12 @@ func (c *Base) restartCloneContainers(ctx context.Context) {
 
 		if err := c.provision.ReconnectClone(ctx, cloneName); err != nil {
 			log.Err(fmt.Sprintf("Clone container %s cannot be reconnected to the internal network: %s", cloneName, err))
+			continue
 		}
 
 		if err := c.provision.StartCloneContainer(ctx, cloneName); err != nil {
 			log.Err(fmt.Sprintf("Clone container %s cannot start: %s", cloneName, err))
+			continue
 		}
 
 		log.Dbg(fmt.Sprintf("Clone container %s is running", cloneName))
@@ -79,7 +81,8 @@ func (c *Base) filterRunningClones(ctx context.Context) {
 	snapshotCache := make(map[string]struct{})
 
 	for cloneID, wrapper := range c.clones {
-		if wrapper.Clone == nil || wrapper.Session == nil || wrapper.Clone.Status.Code == models.StatusFatal {
+		if wrapper.Clone == nil || wrapper.Clone.Snapshot == nil || wrapper.Session == nil ||
+			wrapper.Clone.Status.Code == models.StatusFatal {
 			delete(c.clones, cloneID)
 			continue
 		}
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,8 @@ func (c *Base) fetchSnapshots() error {`
`34`	`34`	`numClones := 0`
`35`	`35`
`36`	`36`	`for cloneName := range c.clones {`
`37`		`- if c.clones[cloneName] != nil && c.clones[cloneName].Clone.Snapshot.ID == entry.ID {`
	`37`	`+ if c.clones[cloneName] != nil && c.clones[cloneName].Clone.Snapshot != nil &&`
	`38`	`+ c.clones[cloneName].Clone.Snapshot.ID == entry.ID {`
`38`	`39`	`numClones++`
`39`	`40`	`}`
`40`	`41`	`}`