diff --git a/test/fileread/cf_sample.f90 b/test/fileread/cf_sample.f90
index 4bd3547a..29ec215b 100644
--- a/test/fileread/cf_sample.f90
+++ b/test/fileread/cf_sample.f90
@@ -70,7 +70,7 @@ program cf_sample
   integer(psb_ipk_) :: iparm(20)
 
   ! other variables
-  integer(psb_ipk_) :: i,info,j,m_problem
+  integer(psb_ipk_) :: i,info,j,m_problem, err_act
   integer(psb_ipk_) :: internal, m,ii,nnzero
   real(psb_dpk_) :: t1, t2, tprec
   real(psb_spk_) :: r_amax, b_amax, scale,resmx,resmxp
@@ -314,14 +314,12 @@ program cf_sample
   call psb_spfree(a, desc_a,info)
   call psb_precfree(prec,info)
   call psb_cdfree(desc_a,info)
-
-9999 continue
-  if(info /= psb_success_) then
-     call psb_error(ictxt)
-  end if
   call psb_exit(ictxt)
   stop
-  
+
+9999 call psb_error(ictxt)
+
+  stop
 end program cf_sample
   
 
diff --git a/test/fileread/df_sample.f90 b/test/fileread/df_sample.f90
index 993422cf..0143a838 100644
--- a/test/fileread/df_sample.f90
+++ b/test/fileread/df_sample.f90
@@ -326,13 +326,12 @@ program df_sample
   call psb_precfree(prec,info)
   call psb_cdfree(desc_a,info)
 
-9999 continue
-  if(info /= psb_success_) then
-    call psb_error(ictxt)
-  end if
   call psb_exit(ictxt)
   stop
 
+9999 call psb_error(ictxt)
+
+  stop
 end program df_sample
   
 
diff --git a/test/fileread/sf_sample.f90 b/test/fileread/sf_sample.f90
index 0e26cc41..32ffc12a 100644
--- a/test/fileread/sf_sample.f90
+++ b/test/fileread/sf_sample.f90
@@ -319,13 +319,12 @@ program sf_sample
   call psb_precfree(prec,info)
   call psb_cdfree(desc_a,info)
 
-9999 continue
-  if(info /= psb_success_) then
-    call psb_error(ictxt)
-  end if
   call psb_exit(ictxt)
   stop
 
+9999 call psb_error(ictxt)
+
+  stop
 end program sf_sample
   
 
diff --git a/test/fileread/zf_sample.f90 b/test/fileread/zf_sample.f90
index e2060b96..c3d217ea 100644
--- a/test/fileread/zf_sample.f90
+++ b/test/fileread/zf_sample.f90
@@ -314,13 +314,12 @@ program zf_sample
   call psb_spfree(a, desc_a,info)
   call psb_precfree(prec,info)
   call psb_cdfree(desc_a,info)
-
-9999 continue
-  if(info /= psb_success_) then
-     call psb_error(ictxt)
-  end if
   call psb_exit(ictxt)
   stop
+
+9999 call psb_error(ictxt)
+
+  stop
   
 end program zf_sample
   
diff --git a/test/kernel/d_file_spmv.f90 b/test/kernel/d_file_spmv.f90
index 4db2d0a6..1198c439 100644
--- a/test/kernel/d_file_spmv.f90
+++ b/test/kernel/d_file_spmv.f90
@@ -283,14 +283,13 @@ program d_file_spmv
   call psb_gefree(x_col, desc_a,info)
   call psb_spfree(a, desc_a,info)
   call psb_cdfree(desc_a,info)
-
-9999 continue
-  if(info /= 0) then
-    call psb_error(ictxt)
-  end if
   call psb_exit(ictxt)
   stop
 
+9999 call psb_error(ictxt)
+
+  stop
+
 end program d_file_spmv
   
 
diff --git a/test/kernel/pdgenspmv.f90 b/test/kernel/pdgenspmv.f90
index e252d5f5..405cff97 100644
--- a/test/kernel/pdgenspmv.f90
+++ b/test/kernel/pdgenspmv.f90
@@ -189,13 +189,13 @@ program pdgenspmv
     goto 9999
   end if
 
-9999 continue
-  if(info /= psb_success_) then
-    call psb_error(ictxt)
-  end if
   call psb_exit(ictxt)
   stop
 
+9999 call psb_error(ictxt)
+
+  stop
+
 contains
   !
   ! get iteration parameters from standard input
diff --git a/test/kernel/s_file_spmv.f90 b/test/kernel/s_file_spmv.f90
index 51e1e523..1f0961f4 100644
--- a/test/kernel/s_file_spmv.f90
+++ b/test/kernel/s_file_spmv.f90
@@ -283,13 +283,13 @@ program s_file_spmv
   call psb_spfree(a, desc_a,info)
   call psb_cdfree(desc_a,info)
 
-9999 continue
-  if(info /= 0) then
-    call psb_error(ictxt)
-  end if
   call psb_exit(ictxt)
   stop
 
+9999 call psb_error(ictxt)
+
+  stop
+
 end program s_file_spmv
   
 
diff --git a/test/pargen/ppde2d.f90 b/test/pargen/ppde2d.f90
index 02d9031b..c25ff2b2 100644
--- a/test/pargen/ppde2d.f90
+++ b/test/pargen/ppde2d.f90
@@ -262,13 +262,13 @@ program ppde2d
     goto 9999
   end if
 
-9999 continue
-  if(info /= psb_success_) then
-    call psb_error(ictxt)
-  end if
   call psb_exit(ictxt)
   stop
 
+9999 call psb_error(ictxt)
+
+  stop
+
 contains
   !
   ! get iteration parameters from standard input
diff --git a/test/pargen/ppde3d.f90 b/test/pargen/ppde3d.f90
index 7fb33f9d..c5059ae0 100644
--- a/test/pargen/ppde3d.f90
+++ b/test/pargen/ppde3d.f90
@@ -275,13 +275,13 @@ program ppde3d
     goto 9999
   end if
 
-9999 continue
-  if(info /= psb_success_) then
-    call psb_error(ictxt)
-  end if
   call psb_exit(ictxt)
   stop
 
+9999 call psb_error(ictxt)
+
+  stop
+
 contains
   !
   ! get iteration parameters from standard input
diff --git a/test/pargen/spde2d.f90 b/test/pargen/spde2d.f90
index 27dc18b3..b0878fe5 100644
--- a/test/pargen/spde2d.f90
+++ b/test/pargen/spde2d.f90
@@ -261,13 +261,13 @@ program spde2d
     goto 9999
   end if
 
-9999 continue
-  if(info /= psb_success_) then
-    call psb_error(ictxt)
-  end if
   call psb_exit(ictxt)
   stop
 
+9999 call psb_error(ictxt)
+
+  stop
+
 contains
   !
   ! get iteration parameters from standard input
diff --git a/test/pargen/spde3d.f90 b/test/pargen/spde3d.f90
index 8c30a7df..07c817d7 100644
--- a/test/pargen/spde3d.f90
+++ b/test/pargen/spde3d.f90
@@ -275,13 +275,13 @@ program spde3d
     goto 9999
   end if
 
-9999 continue
-  if(info /= psb_success_) then
-    call psb_error(ictxt)
-  end if
   call psb_exit(ictxt)
   stop
 
+9999 call psb_error(ictxt)
+
+  stop
+
 contains
   !
   ! get iteration parameters from standard input
diff --git a/test/serial/d_matgen.F90 b/test/serial/d_matgen.F90
index 16134efb..77fb779b 100644
--- a/test/serial/d_matgen.F90
+++ b/test/serial/d_matgen.F90
@@ -70,18 +70,12 @@ program d_matgen
     
   call psb_barrier(ictxt)
   t2 = psb_wtime() - t1
-  if(info /= psb_success_) then
-    call psb_error(ictxt)
-  end if
 
   call psb_exit(ictxt)
   stop
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act == psb_act_abort_) then
-    call psb_error(ictxt)
-  end if
+9999 call psb_error(ictxt)
+
   stop
 
 contains
diff --git a/test/serial/psb_d_cxx_impl.f90 b/test/serial/psb_d_cxx_impl.f90
index b0c4f691..bcc2d5be 100644
--- a/test/serial/psb_d_cxx_impl.f90
+++ b/test/serial/psb_d_cxx_impl.f90
@@ -112,13 +112,7 @@ subroutine psb_d_cxx_csmv(alpha,a,x,beta,y,info,trans)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
   return
 
 contains
@@ -467,13 +461,7 @@ subroutine psb_d_cxx_csmm(alpha,a,x,beta,y,info,trans)
 
   call psb_erractionrestore(err_act)
   return
-9999 continue
-  call psb_erractionrestore(err_act)
-
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
   return
 
 contains
@@ -846,13 +834,7 @@ subroutine psb_d_cxx_cssv(alpha,a,x,beta,y,info,trans)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
   return
 
 contains 
@@ -1105,13 +1087,7 @@ subroutine psb_d_cxx_cssm(alpha,a,x,beta,y,info,trans)
   return
 
 
-9999 continue
-  call psb_erractionrestore(err_act)
-
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
   return
 
 
@@ -1408,13 +1384,7 @@ subroutine psb_d_cxx_rowsum(d,a)
   call psb_erractionrestore(err_act)
   return  
 
-9999 continue
-  call psb_erractionrestore(err_act)
-
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
   return
 
 end subroutine psb_d_cxx_rowsum
@@ -1462,13 +1432,7 @@ subroutine psb_d_cxx_arwsum(d,a)
   call psb_erractionrestore(err_act)
   return  
 
-9999 continue
-  call psb_erractionrestore(err_act)
-
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
   return
 
 end subroutine psb_d_cxx_arwsum
@@ -1519,13 +1483,7 @@ subroutine psb_d_cxx_colsum(d,a)
   call psb_erractionrestore(err_act)
   return  
 
-9999 continue
-  call psb_erractionrestore(err_act)
-
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
   return
 
 end subroutine psb_d_cxx_colsum
@@ -1576,13 +1534,7 @@ subroutine psb_d_cxx_aclsum(d,a)
   call psb_erractionrestore(err_act)
   return  
 
-9999 continue
-  call psb_erractionrestore(err_act)
-
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
   return
 
 end subroutine psb_d_cxx_aclsum
@@ -1633,12 +1585,7 @@ subroutine psb_d_cxx_get_diag(a,d,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
   return
 
 end subroutine psb_d_cxx_get_diag
@@ -1710,12 +1657,7 @@ subroutine psb_d_cxx_scal(d,a,info,side)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
   return
 
 end subroutine psb_d_cxx_scal
@@ -1749,12 +1691,7 @@ subroutine psb_d_cxx_scals(d,a,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
   return
 
 end subroutine psb_d_cxx_scals
@@ -1801,13 +1738,7 @@ subroutine  psb_d_cxx_reallocate_nz(nz,a)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
   return
 
 end subroutine psb_d_cxx_reallocate_nz
@@ -1839,10 +1770,8 @@ subroutine psb_d_cxx_mold(a,b,info)
     goto 9999
   end if
   return
-9999 continue
-  if (err_act /= psb_act_ret_) then
-    call psb_error()
-  end if
+
+9999 call psb_error_handler(err_act)
   return
 
 end subroutine psb_d_cxx_mold
@@ -1902,13 +1831,7 @@ subroutine  psb_d_cxx_allocate_mnnz(m,n,a,nz)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
   return
 
 end subroutine psb_d_cxx_allocate_mnnz
@@ -2003,13 +1926,7 @@ subroutine psb_d_cxx_csgetptn(imin,imax,a,nz,ia,ja,info,&
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
   return
 
 contains
@@ -2181,13 +2098,7 @@ subroutine psb_d_cxx_csgetrow(imin,imax,a,nz,ia,ja,val,info,&
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
   return
 
 contains
@@ -2320,13 +2231,7 @@ subroutine psb_d_cxx_csgetblk(imin,imax,a,b,info,&
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
   return
 
 end subroutine psb_d_cxx_csgetblk
@@ -2411,13 +2316,7 @@ subroutine psb_d_cxx_csput_a(nz,ia,ja,val,a,imin,imax,jmin,jmax,info,gtl)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
   return
 
 
@@ -2660,13 +2559,7 @@ subroutine psb_d_cxx_reinit(a,clear)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
   return
 
 end subroutine psb_d_cxx_reinit
@@ -2695,13 +2588,7 @@ subroutine  psb_d_cxx_trim(a)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
   return
 
 end subroutine psb_d_cxx_trim