--- a/DeviceWorkstation.st	Wed Nov 02 23:20:00 2016 +0100
+++ b/DeviceWorkstation.st	Thu Nov 03 19:05:13 2016 +0100
@@ -815,27 +815,27 @@
 
     "/
     "/ if there is only one screen,
-    "/ take that ... it ought to be display
+    "/ take that ... it ought to be the Display
     "/
     AllScreens size <= 1 ifTrue:[
-	LastActiveProcess := LastActiveScreen := nil.
-	Display notNil ifTrue:[
-	    ^ Display
-	]
+        LastActiveProcess := LastActiveScreen := nil.
+        Display notNil ifTrue:[
+            ^ Display
+        ]
     ].
 
     "/
     "/ someone willing to tell me ?
     "/
     (dev := self currentScreenQuerySignal query) notNil ifTrue:[
-	^ dev
+        ^ dev
     ].
 
     thisProcess := Processor activeProcess.
     LastActiveScreen notNil ifTrue:[
-	LastActiveProcess == thisProcess ifTrue:[
-	    ^ LastActiveScreen
-	]
+        LastActiveProcess == thisProcess ifTrue:[
+            ^ LastActiveScreen
+        ]
     ].
 
     "/
@@ -845,14 +845,14 @@
     "/ the current windowGroup got corrupted somehow ...
 
     (wg := WindowGroup activeGroup) notNil ifTrue:[
-	"/
-	"/ ok, not a background process or scheduler ...
-	"/
-	(dev := wg graphicsDevice) notNil ifTrue:[
-	    LastActiveScreen := dev.
-	    LastActiveProcess := thisProcess.
-	    ^ dev
-	].
+        "/
+        "/ ok, not a background process or scheduler ...
+        "/
+        (dev := wg graphicsDevice) notNil ifTrue:[
+            LastActiveScreen := dev.
+            LastActiveProcess := thisProcess.
+            ^ dev
+        ].
     ].
 
     "/
@@ -861,6 +861,9 @@
     "/
 "/    'DevWorkstation [info]: cannot figure out current screen - use default' infoPrintCR.
 
+    Display isNil ifTrue:[
+        'DevWorkstation [info]: Display is nil.' infoPrintCR.
+    ].    
     ^ Display
 
     "