diff --git a/indra/newview/llsurface.cpp b/indra/newview/llsurface.cpp
index da7f8d2e3..0f10e1e13 100644
--- a/indra/newview/llsurface.cpp
+++ b/indra/newview/llsurface.cpp
@@ -730,6 +730,7 @@ void LLSurface::disconnectNeighbor(LLSurface *surfacep)
 	}
 
 	// Iterate through surface patches, removing any connectivity to removed surface.
+	if (mPatchList) // Don't crash if removed before
 	for (i = 0; i < mNumberOfPatches; i++)
 	{
 		(mPatchList + i)->disconnectNeighbor(surfacep);