diff --git a/src/p_trace.cpp b/src/p_trace.cpp
index eae7d6fd6..48e49dba0 100644
--- a/src/p_trace.cpp
+++ b/src/p_trace.cpp
@@ -637,7 +637,7 @@ cont:
 
 		case TRACE_Skip:
 			Results->HitType = TRACE_HitNone;
-			if (!special3dpass && (TraceFlags & TRACE_3DCallback) && entersector->e->XFloor.ffloors.Size())
+			if (!special3dpass && (TraceFlags & TRACE_3DCallback) && entersector && entersector->e->XFloor.ffloors.Size())
 				return LineCheck(in, dist, hit, true);
 			break;
 
@@ -646,7 +646,7 @@ cont:
 		}
 	}
 
-	if (Results->HitType == TRACE_HitNone)
+	if (Results->HitType == TRACE_HitNone && entersector)
 	{
 		CurSector = entersector;
 		EnterDist = dist;