diff --git a/base/modules/psb_error_impl.F90 b/base/modules/psb_error_impl.F90
index fbb3e8b7..72bd2aff 100644
--- a/base/modules/psb_error_impl.F90
+++ b/base/modules/psb_error_impl.F90
@@ -4,12 +4,11 @@ subroutine psb_errcomm_i(ictxt, err)
   use psb_penv_mod
   integer(psb_ipk_), intent(in)   :: ictxt
   integer(psb_ipk_), intent(inout):: err
-  integer(psb_mpk_)  :: iictxt
 
-  iictxt = ictxt
-  call psb_errcomm(iictxt,err)
+  if (psb_get_global_checks()) call psb_amx(ictxt, err)
 
 end subroutine psb_errcomm_i
+
 #if defined(INT_I8_L8)
 
 subroutine psb_errcomm_m(ictxt, err)
@@ -22,6 +21,7 @@ subroutine psb_errcomm_m(ictxt, err)
 
 end subroutine psb_errcomm_m
 #endif
+
 subroutine psb_ser_error_handler(err_act)
   use psb_error_mod, psb_protect_name => psb_ser_error_handler
   use psb_penv_mod