--- a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java	Fri Apr 08 13:26:38 2016 -0700
+++ b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java	Sat Apr 09 11:03:48 2016 -0700
@@ -1402,7 +1402,13 @@
         Consumer<String> saveHandler = new SaveHandler(src, srcSet);
         Consumer<String> errorHandler = s -> hard("Edit Error: %s", s);
         if (editor == null) {
-            EditPad.edit(errorHandler, src, saveHandler);
+            try {
+                EditPad.edit(errorHandler, src, saveHandler);
+            } catch (RuntimeException ex) {
+                errormsg("jshell.err.cant.launch.editor", ex);
+                fluffmsg("jshell.msg.try.set.editor");
+                return false;
+            }
         } else {
             ExternalEditor.edit(editor, errorHandler, src, saveHandler, input);
         }