--- a/WorkspaceApplication.st	Thu Jun 05 15:56:42 2014 +0200
+++ b/WorkspaceApplication.st	Thu Jun 05 16:38:56 2014 +0200
@@ -3432,11 +3432,16 @@
     | v termView |
 
     (OperatingSystem isUNIXlike 
-            and:[OperatingSystem isOSXlike not "/ mhm - xterm embedding seems to not work on Darvin 
+            "/ mhm - xterm embedding seems to no longer work; the default from user prefs is therefore false
+            and:[UserPreferences current useXTermViewIfAvailable 
             and:[XTermView notNil 
             and:[XTermView isAvailable]]]) ifTrue:[
         v := termView := XTermView new
     ] ifFalse:[
+        VT100TerminalView isNil ifTrue:[
+            Dialog warn:('Missing class: ' , 'VT100TerminalView' allBold).
+            AbortOperationRequest raise 
+        ].
         v := (HVScrollableView for:VT100TerminalView).
         termView := v scrolledView.
         v autoHideScrollBars:false.
@@ -4282,14 +4287,14 @@
 !WorkspaceApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/WorkspaceApplication.st,v 1.267 2014-06-03 16:54:51 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/WorkspaceApplication.st,v 1.268 2014-06-05 14:38:56 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/WorkspaceApplication.st,v 1.267 2014-06-03 16:54:51 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/WorkspaceApplication.st,v 1.268 2014-06-05 14:38:56 cg Exp $'
 !
 
 version_SVN
-    ^ '$Id: WorkspaceApplication.st,v 1.267 2014-06-03 16:54:51 cg Exp $'
+    ^ '$Id: WorkspaceApplication.st,v 1.268 2014-06-05 14:38:56 cg Exp $'
 ! !