diff --git a/zone/command.cpp b/zone/command.cpp
index e0e247e82..df56c3222 100644
--- a/zone/command.cpp
+++ b/zone/command.cpp
@@ -11325,7 +11325,14 @@ void command_camerashake(Client *c, const Seperator *sep)
 
 void command_disarmtrap(Client *c, const Seperator *sep) 
 {
-    Mob * target = c->GetTarget();
+	Mob *target = c->GetTarget();
+
+	if(!target)
+	{
+		c->Message(13, "You must have a target.");
+		return;
+	}
+
 	if(target->IsNPC())
 	{
 		if(c->HasSkill(DISARM_TRAPS))
@@ -11344,7 +11351,13 @@ void command_disarmtrap(Client *c, const Seperator *sep)
 
 void command_sensetrap(Client *c, const Seperator *sep) 
 {
-    Mob * target = c->GetTarget();
+	Mob * target = c->GetTarget();
+	if(!target)
+	{
+		c->Message(13, "You must have a target.");
+		return;
+	}
+
 	if(target->IsNPC())
 	{
 		if(c->HasSkill(SENSE_TRAPS))
@@ -11363,7 +11376,13 @@ void command_sensetrap(Client *c, const Seperator *sep)
 
 void command_picklock(Client *c, const Seperator *sep) 
 {
-    Mob * target = c->GetTarget();
+	Mob * target = c->GetTarget();
+	if(!target)
+	{
+		c->Message(13, "You must have a target.");
+		return;
+	}
+
 	if(target->IsNPC())
 	{
 		if(c->HasSkill(PICK_LOCK))