diff --git a/views/proposals_discussion_plugin_tasks/_task.html.erb b/views/proposals_discussion_plugin_tasks/_task.html.erb
index 938355d..8c9dee2 100644
--- a/views/proposals_discussion_plugin_tasks/_task.html.erb
+++ b/views/proposals_discussion_plugin_tasks/_task.html.erb
@@ -46,16 +46,21 @@
       </div>
 
       <% unless @view_only #MODERATOR VIEW %>
-      <div class="moderator">
-        <b><%= _('Moderator') %>:</b>
-        <span class="value"><%= link_to(task.proposal_evaluation.evaluated_by.name, task.proposal_evaluation.evaluated_by.url) %></span>
-        &nbsp; &#151; &nbsp;
-        <span class="processed">
-          <b><%= _('Moderated at') %>:</b>
-          <span class="value"><%= show_time(task.proposal_evaluation.created_at) %></span>
-        </span>
-      </div>
-      <% end %>
+        <% if task.proposal_evaluation.present? %>
+          <div class="moderator">
+            <b><%= _('Moderator') %>:</b>
+            <% if task.proposal_evaluation.evaluated_by.present? %>
+              <span class="value"><%= link_to(task.proposal_evaluation.evaluated_by.name, task.proposal_evaluation.evaluated_by.url) %></span>
+            <% end %>
+            &nbsp; &#151; &nbsp;
+            <span class="processed">
+              <b><%= _('Moderated at') %>:</b>
+              <span class="value"><%= show_time(task.proposal_evaluation.created_at) %></span>
+            </span>
+          </div>
+        <% end %>
+
+        <% end %>
 
 
       <%= fields_for "tasks[#{task.id}][task]", task do |f| %>
diff --git a/views/tasks/proposals_discussion_plugin/_proposal_task_processed.html.erb b/views/tasks/proposals_discussion_plugin/_proposal_task_processed.html.erb
index 6d3894f..f5f2e70 100644
--- a/views/tasks/proposals_discussion_plugin/_proposal_task_processed.html.erb
+++ b/views/tasks/proposals_discussion_plugin/_proposal_task_processed.html.erb
@@ -16,7 +16,10 @@
 <% if task.proposal_evaluation.present? %>
 <div class="closed-by">
   <span class="label"><%= _('Moderator') %>:</span>
-  <span class="value"><%= link_to(task.proposal_evaluation.evaluated_by.name, task.proposal_evaluation.evaluated_by.url) %></span>
+
+  <% if task.proposal_evaluation.evaluated_by.present? %>
+    <span class="value"><%= link_to(task.proposal_evaluation.evaluated_by.name, task.proposal_evaluation.evaluated_by.url) %></span>
+  <% end %>
   &nbsp; &#151; &nbsp;
   <span class="processed">
     <span class="label"><%= _('Moderated at') %>:</span>
--
libgit2 0.21.2