--- a/DeviceGraphicsContext.st	Tue Mar 20 12:52:39 2018 +0100
+++ b/DeviceGraphicsContext.st	Tue Mar 20 12:53:24 2018 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1992 by Claus Gittinger
 	      All Rights Reserved
@@ -108,16 +106,15 @@
 
     device := Screen current.
     device isNil ifTrue:[
-        device := Display.
-        device isNil ifTrue:[
-            (self class name,' [warning]: no Display') infoPrintCR.
-            Smalltalk lateOpenDisplay.
-
-            device := Screen current ? Display.
-            device isNil ifTrue:[ self error:'no screen device' ]
-        ].
+        (self class name,' [warning]: no Display') infoPrintCR.
+        device := Smalltalk lateOpenDisplay.
+        device isNil ifTrue:[ 
+            Screen deviceOpenErrorSignal raiseErrorString:'no screen device'. 
+        ]
     ].
     ^ self onDevice:device
+
+    "Modified: / 20-03-2018 / 12:46:25 / stefan"
 !
 
 on:aDevice