diff --git a/modules/instruments/README.md b/modules/instruments/README.md
index 7b2bafe4d45..5e2a1d8206f 100644
--- a/modules/instruments/README.md
+++ b/modules/instruments/README.md
@@ -1,4 +1,4 @@
-# Instrument List
+# Instruments Module
 
 ## Purpose
 
diff --git a/php/libraries/NDB_BVL_Instrument.class.inc b/php/libraries/NDB_BVL_Instrument.class.inc
index 4feedfd56eb..11464a2f88e 100644
--- a/php/libraries/NDB_BVL_Instrument.class.inc
+++ b/php/libraries/NDB_BVL_Instrument.class.inc
@@ -2184,10 +2184,10 @@ class NDB_BVL_Instrument extends NDB_Page
             // make the control panel object for the current instrument
             $controlPanel = new NDB_BVL_InstrumentStatus_ControlPanel(
                 $this->testName,
-                $this->getCommentID(),
+                $this->getCommentID() ?? '',
                 0,
                 $this->getSessionID(),
-                $this->page
+                $this->page ?? ''
             );
                $this->addHidden('test_name', $this->testName);
             $this->addHidden('page', $this->page);
@@ -2596,7 +2596,7 @@ class NDB_BVL_Instrument extends NDB_Page
      */
     public function handle(ServerRequestInterface $request) : ResponseInterface
     {
-        $this->setup();
+        $this->setup($this->commentID, $this->page);
         if ($request->getMethod() === "POST") {
             $this->save();
         }