diff --git a/server/shadow/shadow_capture.c b/server/shadow/shadow_capture.c
index 6b1ffeb76..7aa321e67 100644
--- a/server/shadow/shadow_capture.c
+++ b/server/shadow/shadow_capture.c
@@ -94,10 +94,10 @@ int shadow_capture_compare(BYTE* pData1, int nStep1, int nWidth, int nHeight, BY
 	BOOL grid[1024][1024];
 
 	allEqual = TRUE;
+	ZeroMemory(rect, sizeof(RECTANGLE_16));
 	FillMemory(rows, sizeof(rows), 0xFF);
 	FillMemory(cols, sizeof(cols), 0xFF);
 	FillMemory(grid, sizeof(grid), 0xFF);
-	ZeroMemory(rect, sizeof(RECTANGLE_16));
 
 	nrow = (nHeight + 15) / 16;
 	ncol = (nWidth + 15) / 16;
diff --git a/server/shadow/shadow_client.c b/server/shadow/shadow_client.c
index a5eb61970..d3b8b1ebe 100644
--- a/server/shadow/shadow_client.c
+++ b/server/shadow/shadow_client.c
@@ -269,7 +269,7 @@ BOOL shadow_client_activate(freerdp_peer* peer)
 	rdpSettings* settings = peer->settings;
 	rdpShadowClient* client = (rdpShadowClient*) peer->context;
 
-	if (strcmp(settings->ClientDir, "librdp") == 0)
+	if (settings->ClientDir && (strcmp(settings->ClientDir, "librdp") == 0))
 	{
 		/* Hack for Mac/iOS/Android Microsoft RDP clients */