Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.c
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.c	(revision 17228)
+++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.c	(revision 17229)
@@ -653,4 +653,10 @@
  *
  * If I'm wrong, then please explain in full.
+ *
+ * r=misha: this code is to prevent race conditions between PVBOXNETFLTINS construct (which occurs on binding to adapter
+ * rather than on vboxNetFltFactoryCreateAndConnect for static_config) and destruction,
+ * namely the instance returned by vboxNetFltFindInstanceLocked in vboxNetFltSearchCreateInstance could be actually the instance being removed.
+ * I guess an approach similar to what you added to vboxNetFltFactoryCreateAndConnect could be used in vboxNetFltSearchCreateInstance in this case we could remove
+ * this ugly hack.
  */
     if (cRefs != 0)
@@ -1142,10 +1148,10 @@
     AssertRCReturn(rc, rc);
 
-#if defined(VBOX_TAPMINIPORT) && defined(RT_OS_WINDOWS)
-    /* temporary hack to pick up the first adapter */
-    pCur = pGlobals->pInstanceHead; /** @todo Don't for get to remove this temporary hack... :-) */
-#else
+//#if defined(VBOX_TAPMINIPORT) && defined(RT_OS_WINDOWS)
+//    /* temporary hack to pick up the first adapter */
+//    pCur = pGlobals->pInstanceHead; /** @todo Don't for get to remove this temporary hack... :-) */
+//#else
     pCur = vboxNetFltFindInstanceLocked(pGlobals, pszName);
-#endif
+//#endif
     if (pCur)
     {
Index: /trunk/src/VBox/Main/win/NetIfList-win.cpp
===================================================================
--- /trunk/src/VBox/Main/win/NetIfList-win.cpp	(revision 17228)
+++ /trunk/src/VBox/Main/win/NetIfList-win.cpp	(revision 17229)
@@ -610,7 +610,7 @@
                 ULONG uComponentStatus;
                 hr = pMpNcc->GetDeviceStatus(&uComponentStatus);
-#ifndef DEBUG_bird
-                Assert(hr == S_OK);
-#endif
+//#ifndef DEBUG_bird
+//                Assert(hr == S_OK);
+//#endif
                 if(hr == S_OK)
                 {