Index: /trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/presenter/display_base.cpp
===================================================================
--- /trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/presenter/display_base.cpp	(revision 73623)
+++ /trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/presenter/display_base.cpp	(revision 73624)
@@ -327,7 +327,7 @@
             break;
         }
-
-        CrFbVisitCreatedEntries(mpFb, entriesDestroyCb, this);
-    }
+    }
+
+    CrFbVisitCreatedEntries(mpFb, entriesDestroyCb, this);
 
     return rc;
Index: /trunk/src/VBox/Main/src-client/ConsoleVRDPServer.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/ConsoleVRDPServer.cpp	(revision 73623)
+++ /trunk/src/VBox/Main/src-client/ConsoleVRDPServer.cpp	(revision 73624)
@@ -1861,6 +1861,6 @@
 
     H3DORInstance *p = (H3DORInstance *)pvInstance;
-    Assert(p);
-    Assert(p->pThis);
+    AssertPtrReturnVoid(p);
+    AssertPtrReturnVoid(p->pThis);
 
     /** @todo find out what to do if size changes to 0x0 from non zero */
@@ -1984,6 +1984,6 @@
 
     H3DORInstance *p = (H3DORInstance *)pvInstance;
-    Assert(p);
-    Assert(p->pThis);
+    AssertPtrReturnVoid(p);
+    AssertPtrReturnVoid(p->pThis);
 
     if (cRects == 0)
@@ -2015,6 +2015,6 @@
 
     H3DORInstance *p = (H3DORInstance *)pvInstance;
-    Assert(p);
-    Assert(p->pThis);
+    AssertPtrReturnVoid(p);
+    AssertPtrReturnVoid(p->pThis);
 
     /* Currently only a topdown BGR0 bitmap format is supported. */
@@ -2048,9 +2048,10 @@
 
     H3DORInstance *p = (H3DORInstance *)pvInstance;
-    Assert(p);
-    Assert(p->pThis);
+    AssertPtrReturnVoid(p);
+    AssertPtrReturnVoid(p->pThis);
 
     p->pThis->m_interfaceImage.VRDEImageHandleClose(p->hImageBitmap);
 
+    RT_ZERO(*p);
     RTMemFree(p);