diff --git a/ompi/mpi/c/pack_external_size.c b/ompi/mpi/c/pack_external_size.c
index ee98a3deba..25abb79277 100644
--- a/ompi/mpi/c/pack_external_size.c
+++ b/ompi/mpi/c/pack_external_size.c
@@ -36,7 +36,6 @@ static const char FUNC_NAME[] = "MPI_Pack_external_size";
 int MPI_Pack_external_size(char *datarep, int incount,
                            MPI_Datatype datatype, MPI_Aint *size) 
 {
-    int ret;
     ompi_convertor_t local_convertor;
     size_t length;
 
@@ -52,8 +51,8 @@ int MPI_Pack_external_size(char *datarep, int incount,
     ompi_convertor_copy_and_prepare_for_send( ompi_mpi_external32_convertor,
                                               datatype, incount, NULL, &local_convertor );
 
-    ret = ompi_convertor_get_packed_size( &local_convertor, &length );
-    *size = (int)length;
+    ompi_convertor_get_packed_size( &local_convertor, &length );
+    *size = (MPI_Aint)length;
     OBJ_DESTRUCT( &local_convertor );
     
     return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_OTHER, FUNC_NAME);
diff --git a/ompi/mpi/c/pack_size.c b/ompi/mpi/c/pack_size.c
index c71677227f..934f05a48c 100644
--- a/ompi/mpi/c/pack_size.c
+++ b/ompi/mpi/c/pack_size.c
@@ -35,7 +35,6 @@ static const char FUNC_NAME[] = "MPI_Pack_size";
 int MPI_Pack_size(int incount, MPI_Datatype datatype, MPI_Comm comm,
                   int *size) 
 {
-    int ret;
     ompi_convertor_t local_convertor;
     size_t length;
 
@@ -55,9 +54,9 @@ int MPI_Pack_size(int incount, MPI_Datatype datatype, MPI_Comm comm,
     /* the resulting convertor will be set to the position ZERO */
     ompi_convertor_copy_and_prepare_for_send( ompi_mpi_local_convertor, datatype, incount, NULL, &local_convertor );
 
-    ret = ompi_convertor_get_packed_size( &local_convertor, &length );
+    ompi_convertor_get_packed_size( &local_convertor, &length );
     *size = (int)length;
     OBJ_DESTRUCT( &local_convertor );
 
-    OMPI_ERRHANDLER_RETURN(ret, comm, MPI_ERR_UNKNOWN, FUNC_NAME);
+    return MPI_SUCCESS;
 }