diff --git a/src/Squot.package/.squot-contents b/src/Squot.package/.squot-contents
index 09d3ef66c..4538c973f 100644
--- a/src/Squot.package/.squot-contents
+++ b/src/Squot.package/.squot-contents
@@ -1,7 +1,7 @@
 SquotTrackedObjectMetadata {
 	#objectClassName : #PackageInfo,
 	#id : UUID [ '7e0624d4d6eca84f879c365f65ae74be' ],
-	#objectsReplacedByNames : true,
 	#slotOverrides : { },
+	#objectsReplacedByNames : true,
 	#serializer : #SquotCypressCodeSerializer
 }
\ No newline at end of file
diff --git a/src/Squot.package/SquotChangesChooser.class/instance/environment.st b/src/Squot.package/SquotChangesChooser.class/instance/environment.st
index 96362a08b..0a9065900 100644
--- a/src/Squot.package/SquotChangesChooser.class/instance/environment.st
+++ b/src/Squot.package/SquotChangesChooser.class/instance/environment.st
@@ -2,5 +2,5 @@ Smalltalk tools
 environment
 	self selectedNode ifNil: [^ super environment].
 	^ PackageInfo squotEnvironmentOf:
-		(self workingCopy artifactAt: self selectedNode artifactDiff path
+		(self workingCopy artifactAt: (self selectedNode artifactDiff ifNil: [^ super environment]) path
 			ifAbsent: [^ super environment])
\ No newline at end of file
diff --git a/src/Squot.package/SquotChangesChooser.class/methodProperties.json b/src/Squot.package/SquotChangesChooser.class/methodProperties.json
index 9bd51f6c1..7df48c954 100644
--- a/src/Squot.package/SquotChangesChooser.class/methodProperties.json
+++ b/src/Squot.package/SquotChangesChooser.class/methodProperties.json
@@ -42,7 +42,7 @@
 		"diffNodeMenu:shifted:" : "jr 9/25/2020 18:27",
 		"diffNodeMenuHook:" : "jr 11/18/2020 15:26",
 		"diffText" : "jr 9/25/2020 18:27",
-		"environment" : "jr 11/1/2020 20:13",
+		"environment" : "ct 12/29/2021 20:35",
 		"excludeMethodsWithOnlyTimestampChanges:" : "jr 3/8/2022 20:28",
 		"excludePackagesWithoutActiveChanges:" : "jr 3/8/2022 20:28",
 		"hasChildren:" : "jr 9/25/2020 18:27",