diff --git a/src/objects/wpzturbine.c b/src/objects/wpzturbine.c
index 66c76dcde..f86f11da6 100644
--- a/src/objects/wpzturbine.c
+++ b/src/objects/wpzturbine.c
@@ -206,13 +206,19 @@ void Obj_playerWPZTurbine(player_t *p)
 	fixed_t momz;
 
 
-	if (!t || P_MobjWasRemoved(t) || t->type != MT_WATERPALACETURBINE || !t->spawnpoint || p->respawn.state != RESPAWNST_NONE)
+	if (!t || P_MobjWasRemoved(t) || p->respawn.state != RESPAWNST_NONE)
 	{
 		p->turbine = false;
 		P_SetTarget(&pmo->tracer, NULL);
 		return;	// wtf happened
 	}
 
+	if (t->type != MT_WATERPALACETURBINE)
+	{
+		p->turbine = false;
+		return;
+	}
+
 	mt = t->spawnpoint;
 
 	opt1 = (mt->thing_args[0] != 0);