diff --git a/server/Windows/wf_directsound.c b/server/Windows/wf_directsound.c
index 5963d32b3..f80d8066c 100644
--- a/server/Windows/wf_directsound.c
+++ b/server/Windows/wf_directsound.c
@@ -41,7 +41,7 @@ int wf_directsound_activate(rdpsnd_server_context* context)
 	if (FAILED(hr))
 	{
 		_tprintf(_T("Failed to create sound capture device\n"));
-		return;
+		return 1;
 	}
 	_tprintf(_T("Created sound capture device\n"));
 
diff --git a/server/Windows/wf_interface.c b/server/Windows/wf_interface.c
index 79030f18a..9889e398e 100644
--- a/server/Windows/wf_interface.c
+++ b/server/Windows/wf_interface.c
@@ -54,7 +54,8 @@ int get_screen_info(int id, _TCHAR* name, int* width, int* height, int* bpp)
 		*width = GetDeviceCaps(dc, HORZRES);
 		*height = GetDeviceCaps(dc, VERTRES);
 		*bpp = GetDeviceCaps(dc, BITSPIXEL);
-		ReleaseDC(NULL, dc);
+		//ReleaseDC(NULL, dc);
+		DeleteDC(dc);
 
 	}
 	else