diff --git a/virtual_network_manager/src/vnet_manager.c b/virtual_network_manager/src/vnet_manager.c
index c9a28fa..48260bd 100644
--- a/virtual_network_manager/src/vnet_manager.c
+++ b/virtual_network_manager/src/vnet_manager.c
@@ -576,7 +576,7 @@ parse_options( int *argc, char **argv[], db_config *config ) {
   int argc_tmp = *argc;
   char *new_argv[ *argc ];
 
-  for ( int i = 0; i <= *argc; ++i ) {
+  for ( int i = 0; i < *argc; ++i ) {
     new_argv[ i ] = ( *argv )[ i ];
   }
 
@@ -683,8 +683,10 @@ parse_options( int *argc, char **argv[], db_config *config ) {
     }
   }
 
+  if ( argc_tmp < *argc ) {
+    ( *argv )[ argc_tmp ] = NULL;
+  }
   *argc = argc_tmp;
-  ( *argv )[ *argc ] = NULL;
 
   reset_getopt();