diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js
index ec0b116..8ddd82e 100644
--- a/src/pages/DomandaEditPreInstructor/index.js
+++ b/src/pages/DomandaEditPreInstructor/index.js
@@ -267,9 +267,11 @@ const DomandaEditPreInstructor = () => {
         switch (item.fieldName) {
             case 'fileupload' :
                 content = <ul>
-                    {item.fieldValue.map(o => <li key={o.id}>
-                        {o.filePath ? <a href={o.filePath}>{o.name}</a> : null}
-                    </li>)}
+                    {item.fieldValue
+                        ? item.fieldValue.map(o => <li key={o.id}>
+                            {o.filePath ? <a href={o.filePath}>{o.name}</a> : null}
+                        </li>)
+                        : null}
                 </ul>;
                 break;
             case 'table' :
@@ -281,9 +283,11 @@ const DomandaEditPreInstructor = () => {
                     </tr>
                     </thead>
                     <tbody>
-                    {item.fieldValue.map((o, i) => <tr key={i}>
-                        {Object.values(o).map(v => <td key={v}>{v}</td>)}
-                    </tr>)}
+                    {item.fieldValue
+                        ? item.fieldValue.map((o, i) => <tr key={i}>
+                            {Object.values(o).map(v => <td key={v}>{v}</td>)}
+                        </tr>)
+                        : null}
                     </tbody>
                 </table>;
                 break;
@@ -425,7 +429,7 @@ const DomandaEditPreInstructor = () => {
     const doCreateAppointmentRequest = () => {
         if (
             !isEmpty(appointmentData.title) && !isEmpty(appointmentData.text) && !isEmpty(appointmentData.amount)
-        && !isEmpty(appointmentData.duration) && appointmentData.duration !== 0 && appointmentData.amount !== 0
+            && !isEmpty(appointmentData.duration) && appointmentData.duration !== 0 && appointmentData.amount !== 0
         ) {
             console.log(appointmentData);
         }