diff --git a/files/classes/comment.py b/files/classes/comment.py
index d98f441836..d8facb88b2 100644
--- a/files/classes/comment.py
+++ b/files/classes/comment.py
@@ -242,7 +242,7 @@ class Comment(Base):
 			'permalink': self.permalink,
 			'is_pinned': self.is_pinned,
 			'distinguish_level': self.distinguish_level,
-			'post_id': self.post.id,
+			'post_id': self.post.id if self.post else 0,
 			'score': self.score,
 			'upvotes': self.upvotes,
 			'downvotes': self.downvotes,
diff --git a/files/classes/submission.py b/files/classes/submission.py
index 681ba8d8e6..731df7acd2 100644
--- a/files/classes/submission.py
+++ b/files/classes/submission.py
@@ -229,7 +229,7 @@ class Submission(Base):
 		flags = {}
 		for f in self.flags: flags[f.user.username] = f.reason
 
-		data = {'author_name': self.author.username,
+		data = {'author_name': self.author.username if self.author else '',
 				'permalink': self.permalink,
 				'is_banned': bool(self.is_banned),
 				'deleted_utc': self.deleted_utc,