diff --git a/src/pages/student/eligibility_page.rs b/src/pages/student/eligibility_page.rs
index 7fecdea..c49d896 100644
--- a/src/pages/student/eligibility_page.rs
+++ b/src/pages/student/eligibility_page.rs
@@ -104,7 +104,7 @@ pub fn StudentEligibilityPage() -> impl IntoView {
                             debug_log!(
                                 "Resolved requirements: {:?}", resolved_requirements.iter().flatten().map(|rel| rel.display_text.clone()).collect::<Vec<String>>()
                             );
-                            let valid = resolved_requirements
+                            let valid = !scholarship_name.is_empty() && resolved_requirements
                                 .iter()
                                 .all(|list| {
                                     list.iter()
@@ -113,7 +113,10 @@ pub fn StudentEligibilityPage() -> impl IntoView {
                                             |prev, requirement| {
                                                 let result = requirement
                                                     .compare(&student_info)
-                                                    .unwrap_or(false);
+                                                    .unwrap_or_else(|err| {
+                                                        debug_log!("Requirement failed: {err}");
+                                                        false
+                                                    });
                                                 if prev { prev } else { result }
                                             },
                                         )