diff --git a/maps/bots/objectives/_perkmachine.gsc b/maps/bots/objectives/_perkmachine.gsc
index 6d0db31..43e47ea 100644
--- a/maps/bots/objectives/_perkmachine.gsc
+++ b/maps/bots/objectives/_perkmachine.gsc
@@ -7,11 +7,11 @@ init()
 {
 	vending_triggers = GetEntArray( "zombie_vending", "targetname" );
 
-	if ( !isDefined( vending_triggers ) && vending_triggers.size < 1 )
+	if ( !isDefined( vending_triggers ) || vending_triggers.size < 1 )
 	{
 		vending_triggers = getEntArray( "harrybo21_perk_trigger", "targetname" );
 
-		if ( !isDefined( vending_triggers ) && vending_triggers.size < 1 )
+		if ( !isDefined( vending_triggers ) || vending_triggers.size < 1 )
 		{
 			return;
 		}
@@ -57,11 +57,11 @@ Finder( eObj )
 
 	vending_triggers = GetEntArray( "zombie_vending", "targetname" );
 
-	if ( !isDefined( vending_triggers ) && vending_triggers.size < 1 )
+	if ( !isDefined( vending_triggers ) || vending_triggers.size < 1 )
 	{
 		vending_triggers = getEntArray( "harrybo21_perk_trigger", "targetname" );
 
-		if ( !isDefined( vending_triggers ) && vending_triggers.size < 1 )
+		if ( !isDefined( vending_triggers ) || vending_triggers.size < 1 )
 		{
 			return answer;
 		}
diff --git a/maps/bots/objectives/_wallweapon.gsc b/maps/bots/objectives/_wallweapon.gsc
index e71abc0..215df6e 100644
--- a/maps/bots/objectives/_wallweapon.gsc
+++ b/maps/bots/objectives/_wallweapon.gsc
@@ -61,7 +61,12 @@ Finder( eObj )
 			}
 		}
 
-		model = getEnt( weapon_spawns[ i ].target, "targetname" );
+		model = weapon_spawns[ i ];
+
+		if ( isDefined( weapon_spawns[ i ].target ) )
+		{
+			model = getEnt( weapon_spawns[ i ].target, "targetname" );
+		}
 
 		if ( !isDefined( model ) )
 		{
@@ -183,7 +188,13 @@ GoDoWallweapon( eObj )
 	self endon( "cancel_bot_objective" );
 
 	weapon = eObj.eEnt;
-	model = getEnt( weapon.target, "targetname" );
+	model = weapon;
+
+	if ( isDefined( weapon.target ) )
+	{
+		model = getEnt( weapon.target, "targetname" );
+	}
+
 	org = self getOffset( model, weapon );
 
 	weap = self GetCurrentWeapon();