diff --git a/machII/properties/EnvironmentProperty.cfc b/machII/properties/EnvironmentProperty.cfc
index 1f48378..95a016c 100644
--- a/machII/properties/EnvironmentProperty.cfc
+++ b/machII/properties/EnvironmentProperty.cfc
@@ -241,7 +241,7 @@ properties struct can take complex datatypes like structs and arrays.
 						, "The environment name of '#environmentName#' was inherited from the base application environment property. No environment with that name is available in this module named '#getAppManager().getModuleName()#'."
 						, "Please define a default environment for this module or add defined an environment with the name of '#environmentName#'.") />
 				<cfset getAssert().isTrue(Len(getDefaultEnvironment())
-						, "No environment can be resolved for server named '#cgi.SERVER_NAME#' and no default environment has been defined in this module named '#getAppManager().getModuleName()#'."
+						, "No environment can be resolved for server named '#getProperty(getServerPropertyName())#' and no default environment has been defined in this module named '#getAppManager().getModuleName()#'."
 						, "Please define a default environment to use or add this server to a defined environment.") />
 			</cfif>
 				
@@ -326,7 +326,7 @@ properties struct can take complex datatypes like structs and arrays.
 		hint="Matches the current server to an environment name.">
 		
 		<!--- We are knowningly breaking encapsulation by using the cgi scope --->
-		<cfset var thisServer = cgi.SERVER_NAME />
+		<cfset var thisServer = getProperty(getServerPropertyName()) />
 		<cfset var environmentName = "" />
 		<cfset var environmentGroupServerMap = "" />
 		<cfset var resolvedEnvironment = false />
@@ -361,14 +361,17 @@ properties struct can take complex datatypes like structs and arrays.
 		<cfset var environment = variables.environments[arguments.environmentName] />
 		<cfset var properties = environment.properties />
 		<cfset var key = "" />
+		<cfset var serverName = getProperty(getServerPropertyName())/>
 
 		<!--- Load properties by environment --->
 		<cfloop collection="#properties#" item="key">
 			<cfset setProperty(key, properties[key]) />
 		</cfloop>
 	
-		<!--- Set the server name to the property --->
+		<!--- Set the server name to the property, if it doesn't already exist in the property --->
+		<cfif not len(serverName)>
 		<cfset setProperty(getServerPropertyName(), cgi.SERVER_NAME) />
+		</cfif>
 		
 		<cfset getAppManager().setEnvironmentName(environmentName) />
 		<cfset getAppManager().setEnvironmentGroup(environment.environmentGroup) />