diff --git a/app/Models/Flight.php b/app/Models/Flight.php
index d81fcd92..a461b124 100644
--- a/app/Models/Flight.php
+++ b/app/Models/Flight.php
@@ -140,7 +140,7 @@ class Flight extends Model
      */
     public function getIdentAttribute(): string
     {
-        $flight_id = $this->airline->code;
+        $flight_id = optional($this->airline)->code;
         $flight_id .= $this->flight_number;
 
         if (filled($this->route_code)) {
diff --git a/app/Models/Pirep.php b/app/Models/Pirep.php
index c5050551..45e52ae0 100644
--- a/app/Models/Pirep.php
+++ b/app/Models/Pirep.php
@@ -219,7 +219,7 @@ class Pirep extends Model
      */
     public function getIdentAttribute(): string
     {
-        $flight_id = $this->airline->code;
+        $flight_id = optional($this->airline)->code;
         $flight_id .= $this->flight_number;
 
         if (filled($this->route_code)) {
diff --git a/app/Models/User.php b/app/Models/User.php
index c2155ab5..639c1e7d 100755
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -126,7 +126,7 @@ class User extends Authenticatable
     {
         $length = setting('pilots.id_length');
 
-        return $this->airline->icao.str_pad($this->pilot_id, $length, '0', STR_PAD_LEFT);
+        return optional($this->airline)->icao.str_pad($this->pilot_id, $length, '0', STR_PAD_LEFT);
     }
 
     /**
diff --git a/app/Models/UserFieldValue.php b/app/Models/UserFieldValue.php
index 608cdfe7..a4cc2f97 100644
--- a/app/Models/UserFieldValue.php
+++ b/app/Models/UserFieldValue.php
@@ -22,6 +22,14 @@ class UserFieldValue extends Model
 
     public static $rules = [];
 
+    /**
+     * Return related field's name along with field values
+     */
+    public function getNameAttribute(): string
+    {
+        return optional($this->field)->name;
+    }
+
     /**
      * Foreign Keys
      */