diff --git a/scripts/commands/serverdestroyobject.py b/scripts/commands/serverdestroyobject.py
index ee1725b7..5d3e2c60 100644
--- a/scripts/commands/serverdestroyobject.py
+++ b/scripts/commands/serverdestroyobject.py
@@ -7,8 +7,11 @@ def run(core, actor, target, commandString):
 
 	if not target:
 		return
-		
-	print 'Destroy Test'
+	
+	if target.getTemplate() == 'object/waypoint/shared_waypoint.iff':
+		actor.getSlottedObject('ghost').waypointRemove(target)
+		core.objectService.destroyObject(target)
+		return
 	
 	parent = target.getContainer()
 	
diff --git a/scripts/commands/waypoint.py b/scripts/commands/waypoint.py
index b05e1af3..c3776117 100644
--- a/scripts/commands/waypoint.py
+++ b/scripts/commands/waypoint.py
@@ -10,7 +10,7 @@ def run(core, actor, target, commandString):
     crc = CRC
     commandArgs = commandString.split(" ")
     actorPlayer = actor.getSlottedObject("ghost")
-
+    
     #/wp PLANET X Z Y COLOR NAME
     if commandArgs[0] in validPlanets and commandArgs[4] in validColors:
         try: