diff --git a/web/src/routes/admin/problems/[problemId]/+page.svelte b/web/src/routes/admin/problems/[problemId]/+page.svelte
index ae8c9e8..b00588e 100644
--- a/web/src/routes/admin/problems/[problemId]/+page.svelte
+++ b/web/src/routes/admin/problems/[problemId]/+page.svelte
@@ -4,6 +4,7 @@
 	import type { Actions, PageData } from './$types';
 
 	let editing = false;
+	let error = false;
 
 	export let data: PageData;
 	export let form: Actions;
@@ -21,11 +22,20 @@
 		const data = await res.json();
 		if (data.success) {
 			goto('/admin/problems');
+		} else {
+			error = true;
 		}
 	}
 </script>
 
 <h1 style="text-align:center" class="mb-4">{data.problemData.friendlyName}</h1>
+
+{#if error}
+	<div class="alert alert-danger">
+		Error deleting problem (Is it being used in any submissions?)
+	</div>
+{/if}
+
 <div class="row">
 	<div class="col-6">
 		<a href="/admin/problems" class="btn btn-outline-primary">Back</a>
diff --git a/web/src/routes/admin/problems/[problemId]/+server.ts b/web/src/routes/admin/problems/[problemId]/+server.ts
index 41f2838..c722ea5 100644
--- a/web/src/routes/admin/problems/[problemId]/+server.ts
+++ b/web/src/routes/admin/problems/[problemId]/+server.ts
@@ -7,6 +7,10 @@ export const DELETE = (async ({ params }) => {
 	if (isNaN(problemId)) {
 		throw error(400, 'Invalid problem');
 	}
-	await db.problem.delete({ where: { id: problemId } });
+	try {
+		await db.problem.delete({ where: { id: problemId } });
+	} catch {
+		return json({ success: false });
+	}
 	return json({ success: true });
 }) satisfies RequestHandler;
diff --git a/web/src/routes/admin/submissions/[submissionId]/+page.svelte b/web/src/routes/admin/submissions/[submissionId]/+page.svelte
index 4a5a74c..4c39039 100644
--- a/web/src/routes/admin/submissions/[submissionId]/+page.svelte
+++ b/web/src/routes/admin/submissions/[submissionId]/+page.svelte
@@ -29,7 +29,7 @@
 
 <a href="/admin/submissions" class="mb-3 btn btn-outline-primary">All Submissions</a>
 
-<table class="table table-bordered table-hover">
+<table class="table table-bordered">
 	<thead>
 		<tr>
 			<th>Team</th>