diff --git a/advlabdb/customClasses.py b/advlabdb/customClasses.py
index 03cd178..a040325 100644
--- a/advlabdb/customClasses.py
+++ b/advlabdb/customClasses.py
@@ -10,6 +10,7 @@ class SecureAdminIndexView(AdminIndexView):
 
 class SecureModelView(ModelView):
     can_export = True
+    can_set_page_size = True
 
     def is_accessible(self):
         return current_user.has_role("admin")
diff --git a/advlabdb/routes.py b/advlabdb/routes.py
index c9b50d8..91ff43e 100644
--- a/advlabdb/routes.py
+++ b/advlabdb/routes.py
@@ -23,8 +23,12 @@ def util_processor():
         if "activeSemesterId" not in session:
             session["activeSemesterId"] = lastSemesterId
         elif session["activeSemesterId"] != lastSemesterId:
-            flash(f"You are in the old semester {Semester.query.get(session['activeSemesterId']).label}!",
-                  "warning")
+            activeSemester = Semester.query.get(session['activeSemesterId'])
+            if activeSemester:
+                flash(f"You are in the old semester {activeSemester.label}!", "warning")
+            else:
+                flash(f"Semester changed!", "warning")
+                session["activeSemesterId"] = lastSemesterId
         return Semester.query.get(session["activeSemesterId"]).label
 
     def navbarItems(title):