diff --git a/ompi/mpi/f77/finalized_f.c b/ompi/mpi/f77/finalized_f.c
index f853dad006..1c3be16207 100644
--- a/ompi/mpi/f77/finalized_f.c
+++ b/ompi/mpi/f77/finalized_f.c
@@ -61,7 +61,7 @@ void mpi_finalized_f(MPI_Fint *flag, MPI_Fint *ierr)
 {
     OMPI_SINGLE_NAME_DECL(flag);
     *ierr = OMPI_INT_2_FINT(MPI_Finalized(OMPI_SINGLE_NAME_CONVERT(flag)));
-    if (OMPI_FINT_2_INT(*ierr)) {
+    if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr)) {
         OMPI_SINGLE_INT_2_FINT(flag);
     }
 }
diff --git a/ompi/mpi/f77/get_address_f.c b/ompi/mpi/f77/get_address_f.c
index 7a3c1080b5..e54ae73f58 100644
--- a/ompi/mpi/f77/get_address_f.c
+++ b/ompi/mpi/f77/get_address_f.c
@@ -62,7 +62,7 @@ void mpi_get_address_f(char *location, MPI_Fint *address, MPI_Fint *ierr)
     MPI_Aint c_address;
 
     *ierr = OMPI_INT_2_FINT(MPI_Get_address(location, &c_address));
-    if (OMPI_FINT_2_INT(*ierr)) {
+    if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr)) {
         *address = (MPI_Fint) c_address;
     }
 }
diff --git a/ompi/mpi/f77/get_processor_name_f.c b/ompi/mpi/f77/get_processor_name_f.c
index f1a24b182b..fe973413aa 100644
--- a/ompi/mpi/f77/get_processor_name_f.c
+++ b/ompi/mpi/f77/get_processor_name_f.c
@@ -63,7 +63,7 @@ void mpi_get_processor_name_f(char *name, MPI_Fint *resultlen, MPI_Fint *ierr)
 
     *ierr = OMPI_INT_2_FINT(MPI_Get_processor_name(name, 
 				   OMPI_SINGLE_NAME_CONVERT(resultlen)));
-    if (OMPI_FINT_2_INT(*ierr)) {
+    if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr)) {
         OMPI_SINGLE_INT_2_FINT(resultlen);
     }
 }
diff --git a/ompi/mpi/f77/get_version_f.c b/ompi/mpi/f77/get_version_f.c
index 2059d30cad..d644ffd467 100644
--- a/ompi/mpi/f77/get_version_f.c
+++ b/ompi/mpi/f77/get_version_f.c
@@ -64,7 +64,7 @@ void mpi_get_version_f(MPI_Fint *version, MPI_Fint *subversion, MPI_Fint *ierr)
 
     *ierr = OMPI_INT_2_FINT(MPI_Get_version(OMPI_SINGLE_NAME_CONVERT(version),
 				    OMPI_SINGLE_NAME_CONVERT(subversion)));
-    if (OMPI_FINT_2_INT(*ierr)) {
+    if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr)) {
         OMPI_SINGLE_INT_2_FINT(version);
         OMPI_SINGLE_INT_2_FINT(subversion);
     }
diff --git a/ompi/mpi/f77/graph_get_f.c b/ompi/mpi/f77/graph_get_f.c
index d2539d43ed..fc6539ab0b 100644
--- a/ompi/mpi/f77/graph_get_f.c
+++ b/ompi/mpi/f77/graph_get_f.c
@@ -74,7 +74,7 @@ void mpi_graph_get_f(MPI_Fint *comm, MPI_Fint *maxindex,
 					  OMPI_FINT_2_INT(*maxedges),
 					  OMPI_ARRAY_NAME_CONVERT(index),
 					  OMPI_ARRAY_NAME_CONVERT(edges)));
-    if (OMPI_FINT_2_INT(*ierr)) {
+    if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr)) {
         OMPI_ARRAY_INT_2_FINT(index, *maxindex);
         OMPI_ARRAY_INT_2_FINT(edges, *maxedges);
     }
diff --git a/ompi/mpi/f77/graph_map_f.c b/ompi/mpi/f77/graph_map_f.c
index fe3f84eb38..9af6d84ec2 100644
--- a/ompi/mpi/f77/graph_map_f.c
+++ b/ompi/mpi/f77/graph_map_f.c
@@ -75,7 +75,7 @@ void mpi_graph_map_f(MPI_Fint *comm, MPI_Fint *nnodes, MPI_Fint *index,
 					  OMPI_ARRAY_NAME_CONVERT(index),
 					  OMPI_ARRAY_NAME_CONVERT(edges),
 					  OMPI_SINGLE_NAME_CONVERT(nrank)));
-    if (OMPI_FINT_2_INT(*ierr)) {
+    if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr)) {
         OMPI_SINGLE_INT_2_FINT(nrank);
     }
     OMPI_ARRAY_FINT_2_INT_CLEANUP(edges);
diff --git a/ompi/mpi/f77/graph_neighbors_count_f.c b/ompi/mpi/f77/graph_neighbors_count_f.c
index 4a289fce80..b3b750433a 100644
--- a/ompi/mpi/f77/graph_neighbors_count_f.c
+++ b/ompi/mpi/f77/graph_neighbors_count_f.c
@@ -68,7 +68,7 @@ void mpi_graph_neighbors_count_f(MPI_Fint *comm, MPI_Fint *rank,
     *ierr = OMPI_INT_2_FINT(MPI_Graph_neighbors_count(c_comm,
 				      OMPI_FINT_2_INT(*rank),
 				      OMPI_SINGLE_NAME_CONVERT(nneighbors)));
-    if (OMPI_FINT_2_INT(*ierr)) {
+    if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr)) {
         OMPI_SINGLE_INT_2_FINT(nneighbors);
     }
 }
diff --git a/ompi/mpi/f77/graph_neighbors_f.c b/ompi/mpi/f77/graph_neighbors_f.c
index a2ee716f62..540799572f 100644
--- a/ompi/mpi/f77/graph_neighbors_f.c
+++ b/ompi/mpi/f77/graph_neighbors_f.c
@@ -73,7 +73,7 @@ void mpi_graph_neighbors_f(MPI_Fint *comm, MPI_Fint *rank,
 					OMPI_FINT_2_INT(*maxneighbors),
 					OMPI_ARRAY_NAME_CONVERT(neighbors)
 					));
-    if (OMPI_FINT_2_INT(*ierr)) {
+    if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr)) {
         OMPI_ARRAY_INT_2_FINT(neighbors, *maxneighbors);
     }
 }
diff --git a/ompi/mpi/f77/graphdims_get_f.c b/ompi/mpi/f77/graphdims_get_f.c
index e0d684c447..98ad2e3667 100644
--- a/ompi/mpi/f77/graphdims_get_f.c
+++ b/ompi/mpi/f77/graphdims_get_f.c
@@ -70,7 +70,7 @@ void mpi_graphdims_get_f(MPI_Fint *comm, MPI_Fint *nnodes,
 					      OMPI_SINGLE_NAME_CONVERT(nnodes),
 					      OMPI_SINGLE_NAME_CONVERT(nedges)
 					      ));
-    if (OMPI_FINT_2_INT(*ierr)) {
+    if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr)) {
         OMPI_SINGLE_INT_2_FINT(nnodes);
         OMPI_SINGLE_INT_2_FINT(nedges);
     }