diff --git a/CIME/XML/env_batch.py b/CIME/XML/env_batch.py
index 558ff2b0ab4..ecaf1764803 100644
--- a/CIME/XML/env_batch.py
+++ b/CIME/XML/env_batch.py
@@ -1124,8 +1124,14 @@ def get_job_id(self, output):
                 jobid_pattern is not None,
                 "Could not find jobid_pattern in env_batch.xml",
             )
+
+            # If no output was provided, skip the search. This could
+            # be because --no-batch was provided.
+            if not output:
+                return output
         else:
             return output
+
         search_match = re.search(jobid_pattern, output)
         expect(
             search_match is not None,
diff --git a/CIME/non_py/cprnc b/CIME/non_py/cprnc
index d17494561ac..e3eaa5346ec 160000
--- a/CIME/non_py/cprnc
+++ b/CIME/non_py/cprnc
@@ -1 +1 @@
-Subproject commit d17494561ace91fc86387c83591c0382a2c79566
+Subproject commit e3eaa5346ecd50aef8b60fdf54b98cb1c13a24b1
diff --git a/CIME/utils.py b/CIME/utils.py
index 1a32319c8d1..5b186cf7085 100644
--- a/CIME/utils.py
+++ b/CIME/utils.py
@@ -1413,6 +1413,7 @@ def safe_copy(src_path, tgt_path, preserve_meta=True):
                 tgt_path,
                 preserve_mode=preserve_meta,
                 preserve_times=preserve_meta,
+                verbose=0,
             )
         else:
             # I am not the owner, just copy file contents
@@ -1426,6 +1427,7 @@ def safe_copy(src_path, tgt_path, preserve_meta=True):
             tgt_path,
             preserve_mode=preserve_meta,
             preserve_times=preserve_meta,
+            verbose=0,
         )
 
     # If src file was executable, then the tgt file should be too