diff --git a/ompi/errhandler/errhandler_predefined.c b/ompi/errhandler/errhandler_predefined.c
index a97bab2faa..aea87e05cd 100644
--- a/ompi/errhandler/errhandler_predefined.c
+++ b/ompi/errhandler/errhandler_predefined.c
@@ -56,6 +56,7 @@ void ompi_mpi_errors_are_fatal_comm_handler(struct ompi_communicator_t **comm,
       abort_comm = NULL;
   }
   backend_fatal("communicator", abort_comm, name, error_code, arglist);
+  va_end(arglist);
 }
 
 
@@ -76,6 +77,7 @@ void ompi_mpi_errors_are_fatal_file_handler(struct ompi_file_t **file,
       abort_comm = NULL;
   }
   backend_fatal("file", abort_comm, name, error_code, arglist);
+  va_end(arglist);
 }
 
 
@@ -94,6 +96,7 @@ void ompi_mpi_errors_are_fatal_win_handler(struct ompi_win_t **win,
       name = NULL;
   }
   backend_fatal("win", abort_comm, name, error_code, arglist);
+  va_end(arglist);
 }
 
 void ompi_mpi_errors_return_comm_handler(struct ompi_communicator_t **comm,
diff --git a/opal/util/os_path.c b/opal/util/os_path.c
index acc890f316..e153e859ea 100644
--- a/opal/util/os_path.c
+++ b/opal/util/os_path.c
@@ -64,6 +64,8 @@ char *opal_os_path(bool relative, ...)
     	    strcpy(path, path_sep);
 #endif
     	}
+        va_end(ap);
+        va_end(ap1);
     	return(path);
     }
 
@@ -75,11 +77,15 @@ char *opal_os_path(bool relative, ...)
     }
         
     if (total_length > OMPI_PATH_MAX) {  /* path length is too long - reject it */
+        va_end(ap);
+        va_end(ap1);
     	return(NULL);
     }
 
     path = (char *)malloc(total_length);
     if (NULL == path) {
+        va_end(ap);
+        va_end(ap1);
         return(NULL);
     }
     path[0] = 0;