diff --git a/marking_app/lib/routes/RouterManager.dart b/marking_app/lib/routes/RouterManager.dart
index e46123c..b5bcd33 100644
--- a/marking_app/lib/routes/RouterManager.dart
+++ b/marking_app/lib/routes/RouterManager.dart
@@ -184,9 +184,15 @@ class RouterManager {
   static final _jobReportPageHandler = Handler(handlerFunc: (BuildContext? context, Map<String, List<String>> params) {
     int id = int.parse(params['id']![0]);
     String title = params['title']![0];
-    int? schoolId = int.parse(params['schoolId']![0]);
-    int? gradeId = int.parse(params['gradeId']![0]);
-    String? className = params['className']![0];
+    int? schoolId;
+    if (params['schoolId'] != null && params['schoolId']![0] != null && params['schoolId']![0] != 'null') {
+      schoolId = int.parse(params['schoolId']![0]);
+    }
+    int? gradeId;
+    if (params['gradeId'] != null && params['gradeId']![0] != null && params['gradeId']![0] != 'null') {
+      gradeId = int.parse(params['gradeId']![0]);
+    }
+    String? className = params['className']?[0];
     return JobReport(id: id, title: title,schoolId:schoolId,gradeId:gradeId,className:className);
   });