diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp
index 2cbc55aad8..5c17cc24bb 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp
@@ -577,7 +577,7 @@ UpdateSleepTime ParticleUplinkCannonUpdate::update()
 					if( m_scriptedWaypointMode )
 					{
 						Waypoint *way = TheTerrainLogic->getWaypointByID( m_nextDestWaypointID );
-						if( way )
+						if( way && way->getNumLinks() )
 						{
 							//Advance to the next waypoint.
 							Int linkCount = way->getNumLinks();