diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/entity/PacketEntity.java b/plugin/src/main/java/lol/pyr/znpcsplus/entity/PacketEntity.java
index cdee0e8..dc06d00 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/entity/PacketEntity.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/entity/PacketEntity.java
@@ -13,11 +13,7 @@ import lol.pyr.znpcsplus.util.Viewable;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-import java.util.stream.IntStream;
+import java.util.*;
 
 public class PacketEntity implements PropertyHolder {
     private final PacketFactory packetFactory;
@@ -75,8 +71,8 @@ public class PacketEntity implements PropertyHolder {
         if (vehicleId != null) {
             packetFactory.setPassengers(player, vehicleId, this.getEntityId());
         }
-        if(passengers != null) {
-            packetFactory.setPassengers(player, this.getEntityId(),  passengers.stream().mapToInt(Integer::intValue).toArray());
+        if (passengers != null) {
+            packetFactory.setPassengers(player, this.getEntityId(), passengers.stream().mapToInt(Integer::intValue).toArray());
         }
     }
 
@@ -108,7 +104,7 @@ public class PacketEntity implements PropertyHolder {
         if (vehicleId == null) return;
 
         for (Player player : viewable.getViewers()) {
-            packetFactory.setPassengers(player, this.getEntityId(),  vehicleId);
+            packetFactory.setPassengers(player, this.getEntityId(), vehicleId);
         }
     }
 
@@ -141,7 +137,7 @@ public class PacketEntity implements PropertyHolder {
     }
 
     public List<Integer> getPassengers() {
-        return passengers;
+        return passengers == null ? Collections.emptyList() : passengers;
     }
 
     public void addPassenger(int entityId) {
@@ -150,7 +146,7 @@ public class PacketEntity implements PropertyHolder {
         }
         passengers.add(entityId);
         for (Player player : viewable.getViewers()) {
-            packetFactory.setPassengers(player, this.getEntityId(),  passengers.stream().mapToInt(Integer::intValue).toArray());
+            packetFactory.setPassengers(player, this.getEntityId(), passengers.stream().mapToInt(Integer::intValue).toArray());
         }
     }
 
@@ -158,7 +154,7 @@ public class PacketEntity implements PropertyHolder {
         if (passengers == null) return;
         passengers.remove(entityId);
         for (Player player : viewable.getViewers()) {
-            packetFactory.setPassengers(player, this.getEntityId(),  passengers.stream().mapToInt(Integer::intValue).toArray());
+            packetFactory.setPassengers(player, this.getEntityId(), passengers.stream().mapToInt(Integer::intValue).toArray());
         }
         if (passengers.isEmpty()) {
             passengers = null;
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcImpl.java b/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcImpl.java
index fafe780..ad0061f 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcImpl.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcImpl.java
@@ -20,6 +20,7 @@ import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
@@ -248,7 +249,7 @@ public class NpcImpl extends Viewable implements Npc {
     }
 
     @Override
-    public @Nullable List<Integer> getPassengers() {
+    public @NotNull List<Integer> getPassengers() {
         return entity.getPassengers();
     }
 
@@ -271,6 +272,4 @@ public class NpcImpl extends Viewable implements Npc {
     public void setVehicleId(Integer vehicleId) {
         entity.setVehicleId(vehicleId);
     }
-
-
 }