diff --git a/complete.cpp b/complete.cpp
index 019950f0b..4c71ecc2e 100644
--- a/complete.cpp
+++ b/complete.cpp
@@ -913,7 +913,6 @@ static void complete_cmd_desc( const wchar_t *cmd, std::vector<completion_t> &co
 {
 	const wchar_t *cmd_start;
 	int cmd_len;
-	wchar_t *esc;
 	int skip;
 	
 	if( !cmd )
diff --git a/wildcard.cpp b/wildcard.cpp
index bdafe3318..d13de37ad 100644
--- a/wildcard.cpp
+++ b/wildcard.cpp
@@ -266,11 +266,11 @@ static int wildcard_complete_internal( const wchar_t *orig,
 			
 		}
 		
-		if( out_completion )
+		if(out_completion)
 		{
 			completion_allocate( out, 
 								 out_completion,
-								 out_desc,
+								 out_desc ? out_desc : L"",
 								 flags );
 		}