diff --git a/.editorconfig b/.editorconfig
index b8183e82..d597de89 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,6 +1,10 @@
 #
 root = true
 
+[*]
+end_of_line = lf
+insert_final_newline = true
+
 [*.js]
 indent_style = space
 indent_size = 2
diff --git a/resources/views/layouts/default/pireps/table.blade.php b/resources/views/layouts/default/pireps/table.blade.php
index 2a6c6933..114060b6 100644
--- a/resources/views/layouts/default/pireps/table.blade.php
+++ b/resources/views/layouts/default/pireps/table.blade.php
@@ -30,7 +30,7 @@
         </td>
         <td>
           @if($pirep->aircraft)
-            {{ $pirep->aircraft->name }}
+            {{ optional($pirep->aircraft)->name }}
           @else
             -
           @endif
diff --git a/resources/views/layouts/default/widgets/latest_pireps.blade.php b/resources/views/layouts/default/widgets/latest_pireps.blade.php
index 7a671ef5..215c92cd 100644
--- a/resources/views/layouts/default/widgets/latest_pireps.blade.php
+++ b/resources/views/layouts/default/widgets/latest_pireps.blade.php
@@ -8,8 +8,8 @@
         <a href="{{route('frontend.airports.show', [$p->dpt_airport_id])}}">{{$p->dpt_airport_id}}</a>
         &nbsp;-&nbsp;
         <a href="{{route('frontend.airports.show', [$p->arr_airport_id])}}">{{$p->arr_airport_id}}</a>&nbsp;
-        @if($p->aircraft)
-          {{ $p->aircraft->name }}
+        @if(!empty($p->aircraft))
+          {{ optional($p->aircraft)->name }}
         @endif
       </td>
     </tr>