diff --git a/src/main/java/pl/minecon724/giants/Main.java b/src/main/java/pl/minecon724/giants/Main.java
index 17d87fc..b1adf41 100644
--- a/src/main/java/pl/minecon724/giants/Main.java
+++ b/src/main/java/pl/minecon724/giants/Main.java
@@ -86,9 +86,11 @@ public class Main extends JavaPlugin implements Listener {
 			public void run() {
 				for (Entity e : giants) {
 					List<Entity> passengers = e.getPassengers();
-					passengers.removeIf(n -> (n.getType() != EntityType.HUSK));
-					Location loc = passengers.get(0).getLocation();
-					e.setRotation(loc.getYaw(), loc.getPitch());
+					if (passengers.size() > 0) {
+						passengers.removeIf(n -> (n.getType() != EntityType.HUSK));
+						Location loc = passengers.get(0).getLocation();
+						e.setRotation(loc.getYaw(), loc.getPitch());
+					}
 				}
 			}
 		}.runTaskTimerAsynchronously(this, refreshDelay, 0L);