2 files changed, 5 insertions, 2 deletions
diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp
index 7a55a87ff62..e1eb9157357 100644
--- a/cpp/src/Ice/Initialize.cpp
+++ b/cpp/src/Ice/Initialize.cpp
@@ -152,7 +152,10 @@ Ice::stringSeqToArgs(const StringSeq& args, int& argc, char* argv[])
     //
     // Make sure that argv[argc] == 0, the ISO C++ standard requires this.
     //
-    argv[argc] = 0;
+    if(argv)
+    {
+	argv[argc] = 0;
+    }
 }
 
 InstancePtr
diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp
index e5ba4cff3d4..f52eb286069 100644
--- a/cpp/src/IceBox/ServiceManagerI.cpp
+++ b/cpp/src/IceBox/ServiceManagerI.cpp
@@ -267,7 +267,7 @@ IceBox::ServiceManagerI::start(const string& service, const string& entryPoint,
 	else
 	{
 	    int argc = 0;
-	    char *argv[1] = { 0 };
+	    char **argv = 0;
 	    
 	    PropertiesPtr serviceProperties = properties->clone();