diff --git a/base/serial/psb_cgelp.f90 b/base/serial/psb_cgelp.f90
index e5b0feb8..28281905 100644
--- a/base/serial/psb_cgelp.f90
+++ b/base/serial/psb_cgelp.f90
@@ -117,14 +117,8 @@ subroutine psb_cgelp(trans,iperm,x,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
+9999 call psb_error_handler(err_act)
 
-  if (err_act == psb_act_ret_) then
-    return
-  else
-    call psb_error()
-  end if
   return
 
 end subroutine psb_cgelp
@@ -210,7 +204,7 @@ subroutine psb_cgelpv(trans,iperm,x,info)
     goto 9999
   end if
   itemp(:) = iperm(:) 
-  
+
   if (.not.psb_isaperm(i1sz,itemp)) then
     info=psb_err_iarg_invalid_value_
     int_err(1) = 1      
@@ -244,14 +238,8 @@ subroutine psb_cgelpv(trans,iperm,x,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
+9999 call psb_error_handler(err_act)
 
-  if (err_act == psb_act_ret_) then
-    return
-  else
-    call psb_error()
-  end if
   return
 
 end subroutine psb_cgelpv
diff --git a/base/serial/psb_dgelp.f90 b/base/serial/psb_dgelp.f90
index 6533358e..26a3e913 100644
--- a/base/serial/psb_dgelp.f90
+++ b/base/serial/psb_dgelp.f90
@@ -117,14 +117,8 @@ subroutine psb_dgelp(trans,iperm,x,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
+9999 call psb_error_handler(err_act)
 
-  if (err_act == psb_act_ret_) then
-    return
-  else
-    call psb_error()
-  end if
   return
 
 end subroutine psb_dgelp
@@ -210,7 +204,7 @@ subroutine psb_dgelpv(trans,iperm,x,info)
     goto 9999
   end if
   itemp(:) = iperm(:) 
-  
+
   if (.not.psb_isaperm(i1sz,itemp)) then
     info=psb_err_iarg_invalid_value_
     int_err(1) = 1      
@@ -244,14 +238,8 @@ subroutine psb_dgelpv(trans,iperm,x,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
+9999 call psb_error_handler(err_act)
 
-  if (err_act == psb_act_ret_) then
-    return
-  else
-    call psb_error()
-  end if
   return
 
 end subroutine psb_dgelpv
diff --git a/base/serial/psb_sgelp.f90 b/base/serial/psb_sgelp.f90
index 606e7647..6a04314a 100644
--- a/base/serial/psb_sgelp.f90
+++ b/base/serial/psb_sgelp.f90
@@ -117,14 +117,8 @@ subroutine psb_sgelp(trans,iperm,x,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
+9999 call psb_error_handler(err_act)
 
-  if (err_act == psb_act_ret_) then
-    return
-  else
-    call psb_error(ictxt)
-  end if
   return
 
 end subroutine psb_sgelp
@@ -245,14 +239,8 @@ subroutine psb_sgelpv(trans,iperm,x,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
+9999 call psb_error_handler(err_act)
 
-  if (err_act == psb_act_ret_) then
-    return
-  else
-    call psb_error(ictxt)
-  end if
   return
 
 end subroutine psb_sgelpv
diff --git a/base/serial/psb_sort_impl.f90 b/base/serial/psb_sort_impl.f90
index 7f15ad77..15302363 100644
--- a/base/serial/psb_sort_impl.f90
+++ b/base/serial/psb_sort_impl.f90
@@ -242,12 +242,12 @@ subroutine imsort(x,ix,dir,flag)
   else
     call imsr(n,x,dir_)
   end if
+  
+  return
 
-9999 continue 
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
+  return
 end subroutine imsort
 
 
@@ -308,11 +308,11 @@ subroutine smsort(x,ix,dir,flag)
     call smsr(n,x,dir_)
   end if
 
-9999 continue 
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+  return
+
+9999 call psb_error_handler(err_act)
+
+  return
 end subroutine smsort
 
 subroutine dmsort(x,ix,dir,flag)
@@ -372,11 +372,11 @@ subroutine dmsort(x,ix,dir,flag)
     call dmsr(n,x,dir_)
   end if
 
-9999 continue 
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+  return
+
+9999 call psb_error_handler(err_act)
+
+  return
 end subroutine dmsort
 
 subroutine camsort(x,ix,dir,flag)
@@ -436,11 +436,11 @@ subroutine camsort(x,ix,dir,flag)
     call camsr(n,x,dir_)
   end if
 
-9999 continue 
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+  return
+
+9999 call psb_error_handler(err_act)
+
+  return
 end subroutine camsort
 
 subroutine zamsort(x,ix,dir,flag)
@@ -500,11 +500,11 @@ subroutine zamsort(x,ix,dir,flag)
     call zamsr(n,x,dir_)
   end if
 
-9999 continue 
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+  return
+
+9999 call psb_error_handler(err_act)
+
+  return
 end subroutine zamsort
 
 
@@ -543,11 +543,11 @@ subroutine imsort_u(x,nout,dir)
   call imsru(n,x,dir_,nout)
 
 
-9999 continue 
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+  return
+
+9999 call psb_error_handler(err_act)
+
+  return
 end subroutine imsort_u
 
 
@@ -625,11 +625,11 @@ subroutine iqsort(x,ix,dir,flag)
 
 
 
-9999 continue 
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+  return
+
+9999 call psb_error_handler(err_act)
+
+  return
 end subroutine iqsort
 
 
@@ -707,11 +707,11 @@ subroutine sqsort(x,ix,dir,flag)
 
 
 
-9999 continue 
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+  return
+
+9999 call psb_error_handler(err_act)
+
+  return
 end subroutine sqsort
 
 subroutine dqsort(x,ix,dir,flag)
@@ -788,11 +788,11 @@ subroutine dqsort(x,ix,dir,flag)
 
 
 
-9999 continue 
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+  return
+
+9999 call psb_error_handler(err_act)
+
+  return
 end subroutine dqsort
 
 
@@ -884,11 +884,11 @@ subroutine cqsort(x,ix,dir,flag)
 
 
 
-9999 continue 
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+  return
+
+9999 call psb_error_handler(err_act)
+
+  return
 end subroutine cqsort
 
 
@@ -980,11 +980,11 @@ subroutine zqsort(x,ix,dir,flag)
 
 
 
-9999 continue 
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+  return
+
+9999 call psb_error_handler(err_act)
+
+  return
 end subroutine zqsort
 
 
@@ -1095,11 +1095,11 @@ subroutine ihsort(x,ix,dir,flag)
   end if
 
 
-9999 continue 
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+  return
+
+9999 call psb_error_handler(err_act)
+
+  return
 end subroutine ihsort
 
 
@@ -1208,11 +1208,11 @@ subroutine shsort(x,ix,dir,flag)
   end if
 
 
-9999 continue 
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+  return
+
+9999 call psb_error_handler(err_act)
+
+  return
 end subroutine shsort
 
 
@@ -1321,11 +1321,11 @@ subroutine dhsort(x,ix,dir,flag)
   end if
 
 
-9999 continue 
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+  return
+
+9999 call psb_error_handler(err_act)
+
+  return
 end subroutine dhsort
 
 
@@ -1434,11 +1434,11 @@ subroutine chsort(x,ix,dir,flag)
   end if
 
 
-9999 continue 
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+  return
+
+9999 call psb_error_handler(err_act)
+
+  return
 end subroutine chsort
 
 
@@ -1547,11 +1547,11 @@ subroutine zhsort(x,ix,dir,flag)
   end if
 
 
-9999 continue 
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+  return
+
+9999 call psb_error_handler(err_act)
+
+  return
 end subroutine zhsort
 
 
diff --git a/base/serial/psb_zgelp.f90 b/base/serial/psb_zgelp.f90
index 3ad4c71b..04f07814 100644
--- a/base/serial/psb_zgelp.f90
+++ b/base/serial/psb_zgelp.f90
@@ -117,14 +117,8 @@ subroutine psb_zgelp(trans,iperm,x,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
+9999 call psb_error_handler(err_act)
 
-  if (err_act == psb_act_ret_) then
-    return
-  else
-    call psb_error()
-  end if
   return
 
 end subroutine psb_zgelp
@@ -210,7 +204,7 @@ subroutine psb_zgelpv(trans,iperm,x,info)
     goto 9999
   end if
   itemp(:) = iperm(:) 
-  
+
   if (.not.psb_isaperm(i1sz,itemp)) then
     info=psb_err_iarg_invalid_value_
     int_err(1) = 1      
@@ -244,14 +238,8 @@ subroutine psb_zgelpv(trans,iperm,x,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
+9999 call psb_error_handler(err_act)
 
-  if (err_act == psb_act_ret_) then
-    return
-  else
-    call psb_error()
-  end if
   return
 
 end subroutine psb_zgelpv
diff --git a/base/serial/psi_serial_impl.f90 b/base/serial/psi_serial_impl.f90
index fb6243f3..fdcd1b86 100644
--- a/base/serial/psi_serial_impl.f90
+++ b/base/serial/psi_serial_impl.f90
@@ -891,13 +891,8 @@ subroutine psi_iaxpbyv(m,alpha, x, beta, y, info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
+9999 call psb_error_handler(err_act)
 
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
   return
 
 end subroutine psi_iaxpbyv
@@ -952,13 +947,8 @@ subroutine psi_iaxpby(m,n,alpha, x, beta, y, info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
+9999 call psb_error_handler(err_act)
 
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
   return
 
 end subroutine psi_iaxpby
@@ -1009,13 +999,8 @@ subroutine psi_saxpbyv(m,alpha, x, beta, y, info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
+9999 call psb_error_handler(err_act)
 
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
   return
 
 end subroutine psi_saxpbyv
@@ -1070,13 +1055,8 @@ subroutine psi_saxpby(m,n,alpha, x, beta, y, info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
+9999 call psb_error_handler(err_act)
 
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
   return
 
 end subroutine psi_saxpby
@@ -1126,13 +1106,8 @@ subroutine psi_daxpbyv(m,alpha, x, beta, y, info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
+9999 call psb_error_handler(err_act)
 
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
   return
 
 end subroutine psi_daxpbyv
@@ -1187,13 +1162,8 @@ subroutine psi_daxpby(m,n,alpha, x, beta, y, info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
+9999 call psb_error_handler(err_act)
 
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
   return
 end subroutine psi_daxpby
 
@@ -1242,13 +1212,8 @@ subroutine psi_caxpbyv(m,alpha, x, beta, y, info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
+9999 call psb_error_handler(err_act)
 
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
   return
 
 end subroutine psi_caxpbyv
@@ -1303,13 +1268,8 @@ subroutine psi_caxpby(m,n,alpha, x, beta, y, info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
+9999 call psb_error_handler(err_act)
 
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
   return
 end subroutine psi_caxpby
 
@@ -1358,13 +1318,8 @@ subroutine psi_zaxpbyv(m,alpha, x, beta, y, info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
+9999 call psb_error_handler(err_act)
 
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
   return
 
 end subroutine psi_zaxpbyv
@@ -1419,13 +1374,8 @@ subroutine psi_zaxpby(m,n,alpha, x, beta, y, info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
+9999 call psb_error_handler(err_act)
 
-  if (err_act == psb_act_abort_) then
-    call psb_error()
-    return
-  end if
   return
 end subroutine psi_zaxpby