diff --git a/app/routes/jobs.py b/app/routes/jobs.py
index 7ace929..357b9e1 100644
--- a/app/routes/jobs.py
+++ b/app/routes/jobs.py
@@ -269,7 +269,10 @@ def submit_step2():
     try:
         scenario_map = json.loads(scenario_map_json) if scenario_map_json else {}
         selected_scenarios = json.loads(selected_scenarios_json) if selected_scenarios_json else []
-    except json.JSONDecodeError:
+    except json.JSONDecodeError as e:
+        print(f"[ERROR] JSON Decode Error in submit_step2: {e}")
+        print(f"[DEBUG] scenario_map_json: {scenario_map_json}")
+        print(f"[DEBUG] selected_scenarios_json: {selected_scenarios_json}")
         flash('Invalid scenario data', 'error')
         return redirect(url_for('jobs.submit'))
     
@@ -308,6 +311,8 @@ def submit_step2_validated():
             
         except json.JSONDecodeError as e:
             print(f"[ERROR] Step2 - JSON decode error: {e}")
+            print(f"[DEBUG] organized_data_json: {organized_data_json}")
+            print(f"[DEBUG] scenario_map_json: {scenario_map_json}")
             flash('Invalid scenario data', 'error')
             return redirect(url_for('jobs.submit'))
         
@@ -337,7 +342,10 @@ def submit_final():
     try:
         scenarios = json.loads(scenarios_json) if scenarios_json else []
         scenario_map = json.loads(scenario_map_json) if scenario_map_json else {}
-    except json.JSONDecodeError:
+    except json.JSONDecodeError as e:
+        print(f"[ERROR] JSON Decode Error in submit_final: {e}")
+        print(f"[DEBUG] scenarios_json: {scenarios_json}")
+        print(f"[DEBUG] scenario_map_json: {scenario_map_json}")
         flash('Invalid scenario data', 'error')
         return redirect(url_for('jobs.submit'))
     
diff --git a/app/templates/jobs/submit_step2.html b/app/templates/jobs/submit_step2.html
index 9c940d8..e34f1c3 100644
--- a/app/templates/jobs/submit_step2.html
+++ b/app/templates/jobs/submit_step2.html
@@ -27,7 +27,7 @@
 
     <form method="POST" action="{{ url_for('jobs.submit_step2') }}" id="scenarioForm">
         <input type="hidden" name="branch_name" value="{{ branch_name }}">
-        <input type="hidden" name="scenario_map" value="{{ scenario_map|tojson }}">
+        <input type="hidden" name="scenario_map" value='{{ scenario_map|tojson }}'>
         <input type="hidden" name="selected_scenarios" id="selectedScenariosInput">
 
         <div class="scenario-controls">