diff --git a/frontend-js/src/main/js/gui/admin/CommentsAdminPanel.js b/frontend-js/src/main/js/gui/admin/CommentsAdminPanel.js
index 78db63128e1a3569519c2e28db3bc7832f4901d5..1ad62cac5a48f194013dfef37b66db8a366b5963 100644
--- a/frontend-js/src/main/js/gui/admin/CommentsAdminPanel.js
+++ b/frontend-js/src/main/js/gui/admin/CommentsAdminPanel.js
@@ -180,10 +180,20 @@ CommentsAdminPanel.prototype.commentToTableRow = function(comment) {
     remove = "<button name='removeComment' data='" + comment.getId() + "'>REMOVE</button>";
   }
 
+  var author = comment.getAuthor();
+  if (author === undefined) {
+    author = "N/A";
+  }
+
+  var email = comment.getEmail();
+  if (email === undefined) {
+    email = "N/A";
+  }
+
   var row = [ comment.getId(), // 
   title, //
-  comment.getAuthor(), // 
-  comment.getEmail(), // 
+  author, // 
+  email, // 
   comment.getContent(), // 
   remove, //
   toYesNo(comment.isPinned()) ];