diff --git a/files/helpers/get.py b/files/helpers/get.py
index 13949cbdf4..f80e2dc468 100644
--- a/files/helpers/get.py
+++ b/files/helpers/get.py
@@ -60,7 +60,7 @@ def get_user(username, v=None, graceful=False, include_blocks=False, id_only=Fal
 
 	if not user:
 		if graceful: return None
-		abort(404, "User not found.")
+		abort(404, f"A user with the name '{username}' was not found!")
 
 	if v and include_blocks:
 		user = add_block_props(user, v)
diff --git a/files/routes/admin.py b/files/routes/admin.py
index d10220c0f8..3a00cc6266 100644
--- a/files/routes/admin.py
+++ b/files/routes/admin.py
@@ -461,9 +461,7 @@ def badge_grant_post(v):
 		abort(400, "You must enter usernames!")
 
 	for username in usernames.split():
-		user = get_user(username, graceful=True)
-		if not user:
-			abort(400, "User not found!")
+		user = get_user(username)
 
 		try: badge_id = int(request.values.get("badge_id"))
 		except: abort(400)
@@ -531,9 +529,7 @@ def badge_remove_post(v):
 		abort(400, "You must enter usernames!")
 
 	for username in usernames.split():
-		user = get_user(username, graceful=True)
-		if not user:
-			abort(400, "User not found!")
+		user = get_user(username)
 
 		try: badge_id = int(request.values.get("badge_id"))
 		except: abort(400)
diff --git a/files/routes/asset_submissions.py b/files/routes/asset_submissions.py
index 63992dca54..2bb3302481 100644
--- a/files/routes/asset_submissions.py
+++ b/files/routes/asset_submissions.py
@@ -81,9 +81,7 @@ def submit_emoji(v):
 	if not tags_regex.fullmatch(tags):
 		abort(400, "Invalid tags!")
 
-	author = get_user(username, v=v, graceful=True)
-	if not author:
-		abort(400, f"A user with the name '{username}' was not found!")
+	author = get_user(username, v=v)
 
 	highquality = f'/asset_submissions/emojis/{name}'
 	file.save(highquality)
@@ -296,9 +294,7 @@ def submit_hat(v):
 	if not description_regex.fullmatch(description):
 		abort(400, "Invalid description!")
 
-	author = get_user(username, v=v, graceful=True)
-	if not author:
-		abort(400, f"A user with the name '{username}' was not found!")
+	author = get_user(username, v=v)
 
 	highquality = f'/asset_submissions/hats/{name}'
 	file.save(highquality)
diff --git a/files/routes/settings.py b/files/routes/settings.py
index 800ffb25ad..395ffb2860 100644
--- a/files/routes/settings.py
+++ b/files/routes/settings.py
@@ -663,8 +663,7 @@ def settings_blocks(v):
 @limiter.limit("20/day", deduct_when=lambda response: response.status_code < 400, key_func=get_ID)
 @auth_required
 def settings_block_user(v):
-	user = get_user(request.values.get("username"), graceful=True)
-	if not user: abort(404, "This user doesn't exist!")
+	user = get_user(request.values.get("username"))
 
 	if user.unblockable:
 		if not v.shadowbanned: