--- a/UserPreferences.st	Thu Apr 21 16:54:14 2016 +0200
+++ b/UserPreferences.st	Thu Apr 21 17:11:30 2016 +0200
@@ -1939,6 +1939,9 @@
     dict := self at:#fontPreferences.
     dict isNil ifTrue:[^ self].
 
+    Display isNil ifTrue:[^ self].
+    Smalltalk isInitialized ifFalse:[^ self].
+    
     getFont := 
         [:key|
             |s fn|
@@ -1950,6 +1953,7 @@
                     fn := XftFontDescription for:fn
                 ]    
             ].
+            fn notNil ifTrue:[fn := fn onDevice:Display].
             fn
         ].