diff --git a/src/servers/app/ClientMemoryAllocator.cpp b/src/servers/app/ClientMemoryAllocator.cpp
index 746f12cfd9..cb07609bc3 100644
--- a/src/servers/app/ClientMemoryAllocator.cpp
+++ b/src/servers/app/ClientMemoryAllocator.cpp
@@ -324,10 +324,11 @@ ClientMemory::ClientMemory()
 
 ClientMemory::~ClientMemory()
 {
-	if (fBlock != NULL)
-		fAllocator->Free(fBlock);
-	if (fAllocator != NULL)
+	if (fAllocator != NULL) {
+		if (fBlock != NULL)
+			fAllocator->Free(fBlock);
 		fAllocator->ReleaseReference();
+	}
 }