--- a/XftFontDescription.st	Wed Sep 13 13:36:50 2017 +0200
+++ b/XftFontDescription.st	Fri Sep 15 12:42:36 2017 +0200
@@ -1170,12 +1170,18 @@
 releaseFromDevice
     "I am no longer available on the device"
 
+    |deviceID|
+    
     (device notNil and:[fontId notNil]) ifTrue:[
-	self class xftFontClose:fontId displayId:device displayId.
-	device := nil.
-	fontId := nil.
-	width := nil.
+        (deviceID := device displayId) notNil ifTrue:[
+            self class xftFontClose:fontId displayId:deviceID.
+        ].
+        device := nil.
+        fontId := nil.
+        width := nil.
     ].
+
+    "Modified: / 15-09-2017 / 12:42:25 / cg"
 ! !
 
 !XftFontDescription methodsFor:'testing'!