--- a/display.rc	Fri Sep 25 16:06:36 1998 +0200
+++ b/display.rc	Mon Sep 28 11:17:57 1998 +0200
@@ -450,7 +450,7 @@
 "/         Except, when the d_xxx.rc is not present.
 "/
 
-|type|
+|type wm|
 
 View defaultStyle isNil ifTrue:[
     type := OperatingSystem getSystemType.
@@ -466,8 +466,10 @@
     type = 'linux' ifTrue:[
 	"/ if on the local display, and WINDOWMANAGER is fvwm95,
 	"/ use win95 style as default.
+	wm := OperatingSystem getEnvironment:'WINDOWMANAGER'.
 	(((OperatingSystem getEnvironment:'DISPLAY') = ':0')
-	and:[((OperatingSystem getEnvironment:'WINDOWMANAGER') endsWith:'fvwm95')])
+	and:[wm notNil 
+	and:[wm endsWith:'fvwm95']])
 	ifTrue:[
 	    View defaultStyle:#mswindows95 
 	] ifFalse:[