diff --git a/include/wx/cmdargs.h b/include/wx/cmdargs.h
index e4167f0fd6..e34ba52a98 100644
--- a/include/wx/cmdargs.h
+++ b/include/wx/cmdargs.h
@@ -113,7 +113,7 @@ public:
 
 private:
     template <typename T>
-    void Free(T **args)
+    void Free(T**& args)
     {
         if ( !args )
             return;
@@ -123,6 +123,7 @@ private:
             free(args[n]);
 
         delete [] args;
+        args = NULL;
     }
 
     void FreeArgs()