diff --git a/client/common/cmdline.c b/client/common/cmdline.c
index 16d397c4b..172836f93 100644
--- a/client/common/cmdline.c
+++ b/client/common/cmdline.c
@@ -214,18 +214,20 @@ static BOOL freerdp_client_add_drive(rdpSettings* settings, const char* path, co
 
 	if (!path)
 		goto fail;
-	else
+
 	{
 		BOOL isSpecial = FALSE;
 		BOOL isPath = freerdp_path_valid(path, &isSpecial);
 
 		if (!isPath && !isSpecial)
+		{
+			WLog_WARN(TAG, "Invalid drive to redirect: '%s' does not exist, skipping.", path);
+			freerdp_device_free(device);
+		}
+		else if (!freerdp_device_collection_add(settings, device))
 			goto fail;
 	}
 
-	if (!freerdp_device_collection_add(settings, device))
-		goto fail;
-
 	return TRUE;
 
 fail: