diff -r d025735a4090 -r 269dc4bf1f40 src/Pure/ML/ml_process.scala
--- a/src/Pure/ML/ml_process.scala	Fri Mar 27 12:28:55 2020 +0100
+++ b/src/Pure/ML/ml_process.scala	Fri Mar 27 12:46:56 2020 +0100
@@ -14,6 +14,7 @@
 {
   def apply(options: Options,
     sessions_structure: Sessions.Structure,
+    store: Sessions.Store,
     logic: String = "",
     args: List[String] = Nil,
     modes: List[String] = Nil,
@@ -22,18 +23,16 @@
     env: Map[String, String] = Isabelle_System.settings(),
     redirect: Boolean = false,
     cleanup: () => Unit = () => (),
-    session_base: Option[Sessions.Base] = None,
-    store: Option[Sessions.Store] = None): Bash.Process =
+    session_base: Option[Sessions.Base] = None): Bash.Process =
   {
     val logic_name = Isabelle_System.default_logic(logic)
-    val _store = store.getOrElse(Sessions.store(options))
 
     val heaps: List[String] =
       if (raw_ml_system) Nil
       else {
         sessions_structure.selection(Sessions.Selection.session(logic_name)).
           build_requirements(List(logic_name)).
-          map(a => File.platform_path(_store.the_heap(a)))
+          map(a => File.platform_path(store.the_heap(a)))
       }
 
     val eval_init =
@@ -179,9 +178,10 @@
     if (args.isEmpty || more_args.nonEmpty) getopts.usage()
 
     val sessions_structure = Sessions.load_structure(options, dirs = dirs)
+    val store = Sessions.store(options)
 
     val rc =
-      ML_Process(options, sessions_structure, logic = logic, args = eval_args, modes = modes)
+      ML_Process(options, sessions_structure, store, logic = logic, args = eval_args, modes = modes)
         .result().print_stdout.rc
     sys.exit(rc)
   })