diff --git a/src/main/java/org/bukkit/event/player/PlayerPortalEvent.java b/src/main/java/org/bukkit/event/player/PlayerPortalEvent.java
index 1114f5c7..4706811f 100644
--- a/src/main/java/org/bukkit/event/player/PlayerPortalEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerPortalEvent.java
@@ -28,7 +28,7 @@ public class PlayerPortalEvent extends PlayerTeleportEvent {
     }
 
     public boolean useTravelAgent() {
-        return useTravelAgent;
+        return useTravelAgent && travelAgent != null;
     }
 
     public TravelAgent getPortalTravelAgent() {