Added a check to WallBasePtr, Should prevent DC after CC