diff --git a/app/Http/Controllers/DocumentController.php b/app/Http/Controllers/DocumentController.php
index 67b31eb..f724b8f 100644
--- a/app/Http/Controllers/DocumentController.php
+++ b/app/Http/Controllers/DocumentController.php
@@ -243,9 +243,9 @@ class DocumentController extends Controller
                 'penerbit' => $document->publisher,
                 'tipe' => $document->type == Document::TYPE_TETAP ? 'Tetap' : 'Tidak Tetap',
                 'tanggal terbit' => $document->publish_date->format('d-m-Y'),
-                'tanggal jatuh tempo' => $document->due_date->format('d-m-Y'),
+                'tanggal jatuh tempo' => $document->due_date?->format('d-m-Y'),
                 'keterangan' => $document->description,
-                'file' => asset('documents/'.$document->document),
+                'file' => $document->document != null ? asset('documents/'.$document->document) : null,
                 'status' => $document->status == Document::STATUS_YES ? 'Ya' : 'Tidak',
                 'catatan' => $document->due_status,
             ]);
diff --git a/resources/js/Pages/Document/Detail.jsx b/resources/js/Pages/Document/Detail.jsx
index 345cbe8..f4a6447 100644
--- a/resources/js/Pages/Document/Detail.jsx
+++ b/resources/js/Pages/Document/Detail.jsx
@@ -140,17 +140,19 @@ export default function FormDocument(props) {
                                         readOnly={true}
                                     />
                                 </div>
-                                <div className='mt-4'>
-                                    <InputLabel forInput="due_date" value="Tanggal Jatuh Tempo" />
-                                    <TextInput
-                                        type="text"
-                                        name="due_date"
-                                        value={formatDate(doc.due_date)}
-                                        className="mt-1 block w-full"
-                                        autoComplete={"false"}
-                                        readOnly={true}
-                                    />
-                                </div>
+                                {doc.due_date !== null && (
+                                    <div className='mt-4'>
+                                        <InputLabel forInput="due_date" value="Tanggal Jatuh Tempo" />
+                                        <TextInput
+                                            type="text"
+                                            name="due_date"
+                                            value={formatDate(doc.due_date)}
+                                            className="mt-1 block w-full"
+                                            autoComplete={"false"}
+                                            readOnly={true}
+                                        />
+                                    </div>
+                                )}
                                 <div className='mt-4'>
                                     <InputLabel forInput="description" value="Keterangan" />
                                     <TextInput
diff --git a/resources/views/exports/documents.blade.php b/resources/views/exports/documents.blade.php
index b066d8a..c44340a 100644
--- a/resources/views/exports/documents.blade.php
+++ b/resources/views/exports/documents.blade.php
@@ -53,7 +53,11 @@
             <td style="width: 7%;">{{ $collec["tanggal jatuh tempo"] }}</td>
             <td >{{ $collec["keterangan"] }}</td>
             <td >
+                @if($collec["file"] != null)
                 <a href='{{ $collec["file"] }}'>Download</a>
+                @else 
+                Belum ada file
+                @endif
             </td>
             <td >{{ $collec["status"] }}</td>
             <td >{{ $collec["catatan"] }}</td>