diff --git a/src/g_shared/a_weapons.cpp b/src/g_shared/a_weapons.cpp
index bff055eb4..150da2f3c 100644
--- a/src/g_shared/a_weapons.cpp
+++ b/src/g_shared/a_weapons.cpp
@@ -486,7 +486,7 @@ void AWeapon::EndPowerup ()
 	{
 		if (GetReadyState() != SisterWeapon->GetReadyState())
 		{
-			if (Owner->player->PendingWeapon != NULL)
+			if (Owner->player->PendingWeapon == NULL)
 				Owner->player->PendingWeapon = SisterWeapon;
 		}
 		else
diff --git a/src/thingdef_codeptr.cpp b/src/thingdef_codeptr.cpp
index 9695aa088..423f189d6 100644
--- a/src/thingdef_codeptr.cpp
+++ b/src/thingdef_codeptr.cpp
@@ -2021,7 +2021,7 @@ void A_Respawn (AActor *actor)
 		actor->renderflags &= ~RF_INVISIBLE;
 
 		int index=CheckIndex(1, NULL);
-		if (index<0 || EvalExpressionN (StateParameters[index+2], actor))
+		if (index<0 || EvalExpressionN (StateParameters[index], actor))
 		{
 			Spawn<ATeleportFog> (x, y, actor->z + TELEFOGHEIGHT, ALLOW_REPLACE);
 		}