diff --git a/files/routes/errors.py b/files/routes/errors.py
index 5bd6a0812..21b2a9684 100644
--- a/files/routes/errors.py
+++ b/files/routes/errors.py
@@ -54,7 +54,7 @@ def error_401(e):
 
 @app.errorhandler(500)
 def error_500(e):
-	if getattr(g, 'db', None):
+	if hasattr(g, 'db'):
 		g.db.rollback()
 		g.db.close()
 		del g.db
diff --git a/files/routes/wrappers.py b/files/routes/wrappers.py
index c8c59f786..c6b9966c7 100644
--- a/files/routes/wrappers.py
+++ b/files/routes/wrappers.py
@@ -25,8 +25,8 @@ def get_ID():
 	return f'{SITE}-{x}'
 
 def get_logged_in_user():
-	if g.v: return g.v
-	if not getattr(g, 'db', None): g.db = db_session()
+	if hasattr(g, 'v') and g.v: return g.v
+	if not hasattr(g, 'db'): g.db = db_session()
 	g.desires_auth = True
 	v = None
 	token = request.headers.get("Authorization","").strip()