diff --git a/tabellio/pcfviews/question.pt b/tabellio/pcfviews/question.pt
index eeb97a5..4bcc4c1 100644
--- a/tabellio/pcfviews/question.pt
+++ b/tabellio/pcfviews/question.pt
@@ -20,7 +20,7 @@
 
         <h3>Informations générales</h3>
         <ul>
-          <li>Date : <span tal:content="context/date_str">date</span></li>
+          <li tal:condition="context/date">Date : <span tal:content="context/date_str">date</span></li>
           <li>Statut : <span tal:content="context/state_str">En commission</span></li>
           <li tal:condition="context/authors">Auteurs :
              <span tal:content="structure context/authors_html_str">plop</span></li>
@@ -42,7 +42,7 @@
          <table>
          <tr tal:repeat="histoline context/histolines">
           <td tal:content="histoline/date_str">18 octobre 2010</td>
-          <td><p tal:content="histoline/comment">comment</p>
+          <td><p tal:condition="python: hasattr(histoline, 'comment')" tal:content="histoline/comment">comment</p>
             <p tal:condition="histoline/authors" tal:content="histoline/authors_str"/>
           </td>
           <td><a tal:condition="histoline/document" tal:attributes="href
@@ -61,7 +61,6 @@
         </div>
 
 
-
         <div tal:replace="structure provider:plone.belowcontentbody" />
 
     </tal:main-macro>