diff --git a/files/classes/comment.py b/files/classes/comment.py
index 0051a6e0a5..164105278d 100644
--- a/files/classes/comment.py
+++ b/files/classes/comment.py
@@ -249,7 +249,7 @@ class Comment(Base, Age_times, Scores, Stndrd, Fuzzing):
 		if not v or v.slurreplacer: body = body.replace(" nigger"," 🏀").replace(" Nigger"," 🏀").replace(" NIGGER"," 🏀").replace(" pedo"," libertarian").replace(" Pedo"," Libertarian ").replace(" PEDO"," LIBERTARIAN ").replace(" tranny"," 🚄").replace(" Tranny"," 🚄").replace(" TRANNY"," 🚄").replace("  fag","  cute twink").replace("  Fag","  Cute twink").replace("  FAG","  CUTE TWINK").replace(" faggot"," cute twink").replace(" Faggot"," Cute twink").replace(" FAGGOT"," CUTE TWINK").replace(" trump"," DDR").replace(" Trump"," DDR").replace(" TRUMP"," DDR").replace(" biden"," DDD").replace(" Biden"," DDD").replace(" BIDEN"," DDD").replace(" steve akins"," penny verity oaken").replace(" Steve Akins"," Penny Verity Oaken").replace(" STEVE AKINS"," PENNY VERITY OAKEN").replace(" RETARD"," RSLUR").replace(" rapist"," male feminist").replace(" Rapist"," Male feminist").replace(" RAPIST"," MALE FEMINIST").replace(" RETARD"," RSLUR").replace(" rapist"," male feminist").replace(" Rapist"," Male feminist").replace(" RAPIST"," MALE FEMINIST").replace(" RETARD"," RSLUR").replace(" rapist"," male feminist").replace(" Rapist"," Male feminist").replace(" RAPIST"," MALE FEMINIST").replace(" kill yourself"," keep yourself safe").replace(" KILL YOURSELF"," KEEP YOURSELF SAFE").replace(" trannie"," 🚄").replace(" Trannie"," 🚄").replace(" TRANNIE"," 🚄").replace(" troon"," 🚄").replace(" Troon"," 🚄").replace(" TROON"," 🚄")
 		if v and not v.oldreddit: body = body.replace("old.reddit.com", "reddit.com")
 
-		if v.controversial:
+		if v and v.controversial:
 			for i in re.finditer('(/comments/.*?)"', body):
 				url = i.group(1)
 				p = urlparse(url).query
diff --git a/files/routes/flagging.py b/files/routes/flagging.py
index 4e9087e2c8..e594cf0236 100644
--- a/files/routes/flagging.py
+++ b/files/routes/flagging.py
@@ -50,7 +50,7 @@ def api_flag_comment(cid, v):
 			if path.isfile(f'./files/assets/images/emojis/{i.group(1)}.gif'):
 				reason = reason.replace(f':{i.group(1)}:', f'<img data-toggle="tooltip" title="{i.group(1)}" delay="0" height=20 src="https://{site}/assets/images/emojis/{i.group(1)}.gif"<span>')
 
-		flag = CommentFlag(post_id=post.id,
+		flag = CommentFlag(comment_id=comment.id,
 					user_id=v.id,
 					reason=reason,
 					)