diff --git a/examples/fileread/mld_cexample_1lev.f90 b/examples/fileread/mld_cexample_1lev.f90
index 6ffc7220..b163d2c4 100644
--- a/examples/fileread/mld_cexample_1lev.f90
+++ b/examples/fileread/mld_cexample_1lev.f90
@@ -295,14 +295,12 @@ program mld_cexample_ml
   call psb_spfree(A, desc_A,info)
   call mld_precfree(P,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 continue
+  call psb_error(ictxt)
+
 contains
   !
   ! get parameters from standard input
diff --git a/examples/fileread/mld_cexample_ml.f90 b/examples/fileread/mld_cexample_ml.f90
index 762a517e..d1e41b44 100644
--- a/examples/fileread/mld_cexample_ml.f90
+++ b/examples/fileread/mld_cexample_ml.f90
@@ -332,14 +332,12 @@ program mld_cexample_ml
   call psb_spfree(A, desc_A,info)
   call mld_precfree(P,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 continue
+  call psb_error(ictxt)
+
 contains
   !
   ! get parameters from standard input
diff --git a/examples/fileread/mld_dexample_1lev.f90 b/examples/fileread/mld_dexample_1lev.f90
index a91fff6f..dfe783bc 100644
--- a/examples/fileread/mld_dexample_1lev.f90
+++ b/examples/fileread/mld_dexample_1lev.f90
@@ -294,14 +294,12 @@ program mld_dexample_ml
   call psb_spfree(A, desc_A,info)
   call mld_precfree(P,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 continue
+  call psb_error(ictxt)
+
 contains
   !
   ! get parameters from standard input
diff --git a/examples/fileread/mld_dexample_ml.f90 b/examples/fileread/mld_dexample_ml.f90
index b81a2945..8a2344f1 100644
--- a/examples/fileread/mld_dexample_ml.f90
+++ b/examples/fileread/mld_dexample_ml.f90
@@ -331,14 +331,12 @@ program mld_dexample_ml
   call psb_spfree(A, desc_A,info)
   call mld_precfree(P,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 continue
+  call psb_error(ictxt)
+
 contains
   !
   ! get parameters from standard input
diff --git a/examples/fileread/mld_sexample_1lev.f90 b/examples/fileread/mld_sexample_1lev.f90
index f5df1a83..4afca724 100644
--- a/examples/fileread/mld_sexample_1lev.f90
+++ b/examples/fileread/mld_sexample_1lev.f90
@@ -295,14 +295,12 @@ program mld_sexample_ml
   call psb_spfree(A, desc_A,info)
   call mld_precfree(P,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 continue
+  call psb_error(ictxt)
+
 contains
   !
   ! get parameters from standard input
diff --git a/examples/fileread/mld_sexample_ml.f90 b/examples/fileread/mld_sexample_ml.f90
index 6c45de1e..9cab070c 100644
--- a/examples/fileread/mld_sexample_ml.f90
+++ b/examples/fileread/mld_sexample_ml.f90
@@ -332,14 +332,12 @@ program mld_sexample_ml
   call psb_spfree(A, desc_A,info)
   call mld_precfree(P,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 continue
+  call psb_error(ictxt)
+
 contains
   !
   ! get parameters from standard input
diff --git a/examples/fileread/mld_zexample_1lev.f90 b/examples/fileread/mld_zexample_1lev.f90
index d4a74056..e594c331 100644
--- a/examples/fileread/mld_zexample_1lev.f90
+++ b/examples/fileread/mld_zexample_1lev.f90
@@ -294,14 +294,12 @@ program mld_zexample_ml
   call psb_spfree(A, desc_A,info)
   call mld_precfree(P,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 continue
+  call psb_error(ictxt)
+
 contains
   !
   ! get parameters from standard input
diff --git a/examples/fileread/mld_zexample_ml.f90 b/examples/fileread/mld_zexample_ml.f90
index 13a22adc..d5a388fe 100644
--- a/examples/fileread/mld_zexample_ml.f90
+++ b/examples/fileread/mld_zexample_ml.f90
@@ -331,14 +331,12 @@ program mld_zexample_ml
   call psb_spfree(A, desc_A,info)
   call mld_precfree(P,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 continue
+  call psb_error(ictxt)
+
 contains
   !
   ! get parameters from standard input
diff --git a/examples/pdegen/mld_dexample_1lev.f90 b/examples/pdegen/mld_dexample_1lev.f90
index d0f3e95a..5d18ae3a 100644
--- a/examples/pdegen/mld_dexample_1lev.f90
+++ b/examples/pdegen/mld_dexample_1lev.f90
@@ -276,14 +276,12 @@ program mld_dexample_1lev
   call psb_spfree(A, desc_A,info)
   call mld_precfree(P,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 continue
+  call psb_error(ictxt)
+
 contains
   !
   ! get parameters from standard input
diff --git a/examples/pdegen/mld_dexample_ml.f90 b/examples/pdegen/mld_dexample_ml.f90
index bd65f1fe..e200df36 100644
--- a/examples/pdegen/mld_dexample_ml.f90
+++ b/examples/pdegen/mld_dexample_ml.f90
@@ -317,14 +317,12 @@ program mld_dexample_ml
   call psb_spfree(A, desc_A,info)
   call mld_precfree(P,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 continue
+  call psb_error(ictxt)
+
 contains
   !
   ! get parameters from standard input
diff --git a/examples/pdegen/mld_sexample_1lev.f90 b/examples/pdegen/mld_sexample_1lev.f90
index 7a6c79a2..aa0e67ef 100644
--- a/examples/pdegen/mld_sexample_1lev.f90
+++ b/examples/pdegen/mld_sexample_1lev.f90
@@ -281,14 +281,12 @@ program mld_sexample_1lev
   call psb_spfree(A, desc_A,info)
   call mld_precfree(P,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 continue
+  call psb_error(ictxt)
+
 contains
   !
   ! get parameters from standard input
diff --git a/examples/pdegen/mld_sexample_ml.f90 b/examples/pdegen/mld_sexample_ml.f90
index 7c3dd2e1..96293961 100644
--- a/examples/pdegen/mld_sexample_ml.f90
+++ b/examples/pdegen/mld_sexample_ml.f90
@@ -317,14 +317,12 @@ program mld_sexample_ml
   call psb_spfree(A, desc_A,info)
   call mld_precfree(P,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 continue
+  call psb_error(ictxt)
+
 contains
   !
   ! get parameters from standard input
diff --git a/mlprec/impl/level/mld_c_base_onelev_check.f90 b/mlprec/impl/level/mld_c_base_onelev_check.f90
index bc2812e3..782ee4c1 100644
--- a/mlprec/impl/level/mld_c_base_onelev_check.f90
+++ b/mlprec/impl/level/mld_c_base_onelev_check.f90
@@ -73,11 +73,7 @@ subroutine mld_c_base_onelev_check(lv,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 mld_c_base_onelev_check
diff --git a/mlprec/impl/level/mld_c_base_onelev_csetc.f90 b/mlprec/impl/level/mld_c_base_onelev_csetc.f90
index 40c1cc72..016329e4 100644
--- a/mlprec/impl/level/mld_c_base_onelev_csetc.f90
+++ b/mlprec/impl/level/mld_c_base_onelev_csetc.f90
@@ -71,11 +71,7 @@ subroutine mld_c_base_onelev_csetc(lv,what,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
+
 end subroutine mld_c_base_onelev_csetc
diff --git a/mlprec/impl/level/mld_c_base_onelev_cseti.f90 b/mlprec/impl/level/mld_c_base_onelev_cseti.f90
index 26726645..19505763 100644
--- a/mlprec/impl/level/mld_c_base_onelev_cseti.f90
+++ b/mlprec/impl/level/mld_c_base_onelev_cseti.f90
@@ -103,11 +103,7 @@ subroutine mld_c_base_onelev_cseti(lv,what,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
+
 end subroutine mld_c_base_onelev_cseti
diff --git a/mlprec/impl/level/mld_c_base_onelev_csetr.f90 b/mlprec/impl/level/mld_c_base_onelev_csetr.f90
index ffc4e993..54eb3f47 100644
--- a/mlprec/impl/level/mld_c_base_onelev_csetr.f90
+++ b/mlprec/impl/level/mld_c_base_onelev_csetr.f90
@@ -74,11 +74,7 @@ subroutine mld_c_base_onelev_csetr(lv,what,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
+
 end subroutine mld_c_base_onelev_csetr
diff --git a/mlprec/impl/level/mld_c_base_onelev_descr.f90 b/mlprec/impl/level/mld_c_base_onelev_descr.f90
index fe68ad45..963dd58f 100644
--- a/mlprec/impl/level/mld_c_base_onelev_descr.f90
+++ b/mlprec/impl/level/mld_c_base_onelev_descr.f90
@@ -94,11 +94,7 @@ subroutine mld_c_base_onelev_descr(lv,il,nl,info,iout)
   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 mld_c_base_onelev_descr
diff --git a/mlprec/impl/level/mld_c_base_onelev_setc.f90 b/mlprec/impl/level/mld_c_base_onelev_setc.f90
index 82c8a3a3..4aa44777 100644
--- a/mlprec/impl/level/mld_c_base_onelev_setc.f90
+++ b/mlprec/impl/level/mld_c_base_onelev_setc.f90
@@ -71,11 +71,7 @@ subroutine mld_c_base_onelev_setc(lv,what,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
+
 end subroutine mld_c_base_onelev_setc
diff --git a/mlprec/impl/level/mld_c_base_onelev_seti.f90 b/mlprec/impl/level/mld_c_base_onelev_seti.f90
index d81be800..06dabac8 100644
--- a/mlprec/impl/level/mld_c_base_onelev_seti.f90
+++ b/mlprec/impl/level/mld_c_base_onelev_seti.f90
@@ -103,11 +103,7 @@ subroutine mld_c_base_onelev_seti(lv,what,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
+
 end subroutine mld_c_base_onelev_seti
diff --git a/mlprec/impl/level/mld_c_base_onelev_setr.f90 b/mlprec/impl/level/mld_c_base_onelev_setr.f90
index 2dde5ad6..45f66f6c 100644
--- a/mlprec/impl/level/mld_c_base_onelev_setr.f90
+++ b/mlprec/impl/level/mld_c_base_onelev_setr.f90
@@ -74,11 +74,7 @@ subroutine mld_c_base_onelev_setr(lv,what,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
+
 end subroutine mld_c_base_onelev_setr
diff --git a/mlprec/impl/level/mld_d_base_onelev_check.f90 b/mlprec/impl/level/mld_d_base_onelev_check.f90
index e9c30a58..91d720d5 100644
--- a/mlprec/impl/level/mld_d_base_onelev_check.f90
+++ b/mlprec/impl/level/mld_d_base_onelev_check.f90
@@ -73,11 +73,7 @@ subroutine mld_d_base_onelev_check(lv,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 mld_d_base_onelev_check
diff --git a/mlprec/impl/level/mld_d_base_onelev_csetc.f90 b/mlprec/impl/level/mld_d_base_onelev_csetc.f90
index 16e15aae..ab03ccdd 100644
--- a/mlprec/impl/level/mld_d_base_onelev_csetc.f90
+++ b/mlprec/impl/level/mld_d_base_onelev_csetc.f90
@@ -71,11 +71,7 @@ subroutine mld_d_base_onelev_csetc(lv,what,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
+
 end subroutine mld_d_base_onelev_csetc
diff --git a/mlprec/impl/level/mld_d_base_onelev_cseti.f90 b/mlprec/impl/level/mld_d_base_onelev_cseti.f90
index 85fda0bc..e2bbb256 100644
--- a/mlprec/impl/level/mld_d_base_onelev_cseti.f90
+++ b/mlprec/impl/level/mld_d_base_onelev_cseti.f90
@@ -103,11 +103,7 @@ subroutine mld_d_base_onelev_cseti(lv,what,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
+
 end subroutine mld_d_base_onelev_cseti
diff --git a/mlprec/impl/level/mld_d_base_onelev_csetr.f90 b/mlprec/impl/level/mld_d_base_onelev_csetr.f90
index 57ec681c..3ed373f2 100644
--- a/mlprec/impl/level/mld_d_base_onelev_csetr.f90
+++ b/mlprec/impl/level/mld_d_base_onelev_csetr.f90
@@ -74,11 +74,7 @@ subroutine mld_d_base_onelev_csetr(lv,what,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
+
 end subroutine mld_d_base_onelev_csetr
diff --git a/mlprec/impl/level/mld_d_base_onelev_descr.f90 b/mlprec/impl/level/mld_d_base_onelev_descr.f90
index cf3d100e..d48aab14 100644
--- a/mlprec/impl/level/mld_d_base_onelev_descr.f90
+++ b/mlprec/impl/level/mld_d_base_onelev_descr.f90
@@ -94,11 +94,7 @@ subroutine mld_d_base_onelev_descr(lv,il,nl,info,iout)
   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 mld_d_base_onelev_descr
diff --git a/mlprec/impl/level/mld_d_base_onelev_setc.f90 b/mlprec/impl/level/mld_d_base_onelev_setc.f90
index 336ca20f..e589fe7d 100644
--- a/mlprec/impl/level/mld_d_base_onelev_setc.f90
+++ b/mlprec/impl/level/mld_d_base_onelev_setc.f90
@@ -71,11 +71,7 @@ subroutine mld_d_base_onelev_setc(lv,what,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
+
 end subroutine mld_d_base_onelev_setc
diff --git a/mlprec/impl/level/mld_d_base_onelev_seti.f90 b/mlprec/impl/level/mld_d_base_onelev_seti.f90
index dc97a34a..b0f8dce9 100644
--- a/mlprec/impl/level/mld_d_base_onelev_seti.f90
+++ b/mlprec/impl/level/mld_d_base_onelev_seti.f90
@@ -103,11 +103,7 @@ subroutine mld_d_base_onelev_seti(lv,what,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
+
 end subroutine mld_d_base_onelev_seti
diff --git a/mlprec/impl/level/mld_d_base_onelev_setr.f90 b/mlprec/impl/level/mld_d_base_onelev_setr.f90
index ad37f8c6..1a83bc32 100644
--- a/mlprec/impl/level/mld_d_base_onelev_setr.f90
+++ b/mlprec/impl/level/mld_d_base_onelev_setr.f90
@@ -74,11 +74,7 @@ subroutine mld_d_base_onelev_setr(lv,what,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
+
 end subroutine mld_d_base_onelev_setr
diff --git a/mlprec/impl/level/mld_s_base_onelev_check.f90 b/mlprec/impl/level/mld_s_base_onelev_check.f90
index 2df6630f..eafa3f35 100644
--- a/mlprec/impl/level/mld_s_base_onelev_check.f90
+++ b/mlprec/impl/level/mld_s_base_onelev_check.f90
@@ -73,11 +73,7 @@ subroutine mld_s_base_onelev_check(lv,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 mld_s_base_onelev_check
diff --git a/mlprec/impl/level/mld_s_base_onelev_csetc.f90 b/mlprec/impl/level/mld_s_base_onelev_csetc.f90
index 7012b083..a5305fc2 100644
--- a/mlprec/impl/level/mld_s_base_onelev_csetc.f90
+++ b/mlprec/impl/level/mld_s_base_onelev_csetc.f90
@@ -71,11 +71,7 @@ subroutine mld_s_base_onelev_csetc(lv,what,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
+
 end subroutine mld_s_base_onelev_csetc
diff --git a/mlprec/impl/level/mld_s_base_onelev_cseti.f90 b/mlprec/impl/level/mld_s_base_onelev_cseti.f90
index 28a07d71..b5306598 100644
--- a/mlprec/impl/level/mld_s_base_onelev_cseti.f90
+++ b/mlprec/impl/level/mld_s_base_onelev_cseti.f90
@@ -103,11 +103,7 @@ subroutine mld_s_base_onelev_cseti(lv,what,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
+
 end subroutine mld_s_base_onelev_cseti
diff --git a/mlprec/impl/level/mld_s_base_onelev_csetr.f90 b/mlprec/impl/level/mld_s_base_onelev_csetr.f90
index 3f010939..f308fe9f 100644
--- a/mlprec/impl/level/mld_s_base_onelev_csetr.f90
+++ b/mlprec/impl/level/mld_s_base_onelev_csetr.f90
@@ -74,11 +74,7 @@ subroutine mld_s_base_onelev_csetr(lv,what,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
+
 end subroutine mld_s_base_onelev_csetr
diff --git a/mlprec/impl/level/mld_s_base_onelev_descr.f90 b/mlprec/impl/level/mld_s_base_onelev_descr.f90
index 86ab5f62..9ff46f50 100644
--- a/mlprec/impl/level/mld_s_base_onelev_descr.f90
+++ b/mlprec/impl/level/mld_s_base_onelev_descr.f90
@@ -94,11 +94,7 @@ subroutine mld_s_base_onelev_descr(lv,il,nl,info,iout)
   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 mld_s_base_onelev_descr
diff --git a/mlprec/impl/level/mld_s_base_onelev_setc.f90 b/mlprec/impl/level/mld_s_base_onelev_setc.f90
index 486025db..0708113f 100644
--- a/mlprec/impl/level/mld_s_base_onelev_setc.f90
+++ b/mlprec/impl/level/mld_s_base_onelev_setc.f90
@@ -71,11 +71,7 @@ subroutine mld_s_base_onelev_setc(lv,what,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
+
 end subroutine mld_s_base_onelev_setc
diff --git a/mlprec/impl/level/mld_s_base_onelev_seti.f90 b/mlprec/impl/level/mld_s_base_onelev_seti.f90
index 55f9ccd5..c54c6ff0 100644
--- a/mlprec/impl/level/mld_s_base_onelev_seti.f90
+++ b/mlprec/impl/level/mld_s_base_onelev_seti.f90
@@ -103,11 +103,7 @@ subroutine mld_s_base_onelev_seti(lv,what,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
+
 end subroutine mld_s_base_onelev_seti
diff --git a/mlprec/impl/level/mld_s_base_onelev_setr.f90 b/mlprec/impl/level/mld_s_base_onelev_setr.f90
index 50aefbab..ddda6f46 100644
--- a/mlprec/impl/level/mld_s_base_onelev_setr.f90
+++ b/mlprec/impl/level/mld_s_base_onelev_setr.f90
@@ -74,11 +74,7 @@ subroutine mld_s_base_onelev_setr(lv,what,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
+
 end subroutine mld_s_base_onelev_setr
diff --git a/mlprec/impl/level/mld_z_base_onelev_check.f90 b/mlprec/impl/level/mld_z_base_onelev_check.f90
index f9652b5b..c0f007a8 100644
--- a/mlprec/impl/level/mld_z_base_onelev_check.f90
+++ b/mlprec/impl/level/mld_z_base_onelev_check.f90
@@ -73,11 +73,7 @@ subroutine mld_z_base_onelev_check(lv,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 mld_z_base_onelev_check
diff --git a/mlprec/impl/level/mld_z_base_onelev_csetc.f90 b/mlprec/impl/level/mld_z_base_onelev_csetc.f90
index 90337534..c3e92b34 100644
--- a/mlprec/impl/level/mld_z_base_onelev_csetc.f90
+++ b/mlprec/impl/level/mld_z_base_onelev_csetc.f90
@@ -71,11 +71,7 @@ subroutine mld_z_base_onelev_csetc(lv,what,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
+
 end subroutine mld_z_base_onelev_csetc
diff --git a/mlprec/impl/level/mld_z_base_onelev_cseti.f90 b/mlprec/impl/level/mld_z_base_onelev_cseti.f90
index a15cad26..dd4f150f 100644
--- a/mlprec/impl/level/mld_z_base_onelev_cseti.f90
+++ b/mlprec/impl/level/mld_z_base_onelev_cseti.f90
@@ -103,11 +103,7 @@ subroutine mld_z_base_onelev_cseti(lv,what,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
+
 end subroutine mld_z_base_onelev_cseti
diff --git a/mlprec/impl/level/mld_z_base_onelev_csetr.f90 b/mlprec/impl/level/mld_z_base_onelev_csetr.f90
index 69530c0a..9ad57855 100644
--- a/mlprec/impl/level/mld_z_base_onelev_csetr.f90
+++ b/mlprec/impl/level/mld_z_base_onelev_csetr.f90
@@ -74,11 +74,7 @@ subroutine mld_z_base_onelev_csetr(lv,what,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
+
 end subroutine mld_z_base_onelev_csetr
diff --git a/mlprec/impl/level/mld_z_base_onelev_descr.f90 b/mlprec/impl/level/mld_z_base_onelev_descr.f90
index d72eaf68..ac2746c4 100644
--- a/mlprec/impl/level/mld_z_base_onelev_descr.f90
+++ b/mlprec/impl/level/mld_z_base_onelev_descr.f90
@@ -94,11 +94,7 @@ subroutine mld_z_base_onelev_descr(lv,il,nl,info,iout)
   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 mld_z_base_onelev_descr
diff --git a/mlprec/impl/level/mld_z_base_onelev_setc.f90 b/mlprec/impl/level/mld_z_base_onelev_setc.f90
index d5fa380e..8b53fcb9 100644
--- a/mlprec/impl/level/mld_z_base_onelev_setc.f90
+++ b/mlprec/impl/level/mld_z_base_onelev_setc.f90
@@ -71,11 +71,7 @@ subroutine mld_z_base_onelev_setc(lv,what,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
+
 end subroutine mld_z_base_onelev_setc
diff --git a/mlprec/impl/level/mld_z_base_onelev_seti.f90 b/mlprec/impl/level/mld_z_base_onelev_seti.f90
index ef4ce675..75630eac 100644
--- a/mlprec/impl/level/mld_z_base_onelev_seti.f90
+++ b/mlprec/impl/level/mld_z_base_onelev_seti.f90
@@ -103,11 +103,7 @@ subroutine mld_z_base_onelev_seti(lv,what,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
+
 end subroutine mld_z_base_onelev_seti
diff --git a/mlprec/impl/level/mld_z_base_onelev_setr.f90 b/mlprec/impl/level/mld_z_base_onelev_setr.f90
index 2e0b4199..7cecbff9 100644
--- a/mlprec/impl/level/mld_z_base_onelev_setr.f90
+++ b/mlprec/impl/level/mld_z_base_onelev_setr.f90
@@ -74,11 +74,7 @@ subroutine mld_z_base_onelev_setr(lv,what,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
+
 end subroutine mld_z_base_onelev_setr
diff --git a/mlprec/impl/mld_c_dec_map_bld.f90 b/mlprec/impl/mld_c_dec_map_bld.f90
index 17c36a27..b43f66f2 100644
--- a/mlprec/impl/mld_c_dec_map_bld.f90
+++ b/mlprec/impl/mld_c_dec_map_bld.f90
@@ -319,12 +319,8 @@ subroutine mld_c_dec_map_bld(theta,a,desc_a,nlaggr,ilaggr,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine mld_c_dec_map_bld
diff --git a/mlprec/impl/mld_caggrmap_bld.f90 b/mlprec/impl/mld_caggrmap_bld.f90
index bce17bdc..0692999e 100644
--- a/mlprec/impl/mld_caggrmap_bld.f90
+++ b/mlprec/impl/mld_caggrmap_bld.f90
@@ -153,12 +153,8 @@ subroutine mld_caggrmap_bld(aggr_type,theta,a,desc_a,ilaggr,nlaggr,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine mld_caggrmap_bld
diff --git a/mlprec/impl/mld_caggrmat_asb.f90 b/mlprec/impl/mld_caggrmat_asb.f90
index 19b66966..619eb1b7 100644
--- a/mlprec/impl/mld_caggrmat_asb.f90
+++ b/mlprec/impl/mld_caggrmat_asb.f90
@@ -273,12 +273,8 @@ subroutine mld_caggrmat_asb(a,desc_a,ilaggr,nlaggr,p,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine mld_caggrmat_asb
diff --git a/mlprec/impl/mld_caggrmat_biz_asb.f90 b/mlprec/impl/mld_caggrmat_biz_asb.f90
index 44790a4b..2bee5e6d 100644
--- a/mlprec/impl/mld_caggrmat_biz_asb.f90
+++ b/mlprec/impl/mld_caggrmat_biz_asb.f90
@@ -404,13 +404,8 @@ subroutine mld_caggrmat_biz_asb(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_restr
 
 9999 continue
   call psb_errpush(info,name)
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
-  return
-
 
+  call psb_error_handler(err_act)
+  return
 
 end subroutine mld_caggrmat_biz_asb
diff --git a/mlprec/impl/mld_caggrmat_minnrg_asb.f90 b/mlprec/impl/mld_caggrmat_minnrg_asb.f90
index 8365d522..256385a7 100644
--- a/mlprec/impl/mld_caggrmat_minnrg_asb.f90
+++ b/mlprec/impl/mld_caggrmat_minnrg_asb.f90
@@ -593,11 +593,7 @@ subroutine mld_caggrmat_minnrg_asb(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_re
 
 9999 continue
   call psb_errpush(info,name)
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+  call psb_error_handler(err_act)
   return
 
 
diff --git a/mlprec/impl/mld_caggrmat_nosmth_asb.f90 b/mlprec/impl/mld_caggrmat_nosmth_asb.f90
index a52a4f3d..d66e2ce0 100644
--- a/mlprec/impl/mld_caggrmat_nosmth_asb.f90
+++ b/mlprec/impl/mld_caggrmat_nosmth_asb.f90
@@ -175,12 +175,8 @@ subroutine mld_caggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_re
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine mld_caggrmat_nosmth_asb
diff --git a/mlprec/impl/mld_caggrmat_smth_asb.f90 b/mlprec/impl/mld_caggrmat_smth_asb.f90
index 143797c8..ea254528 100644
--- a/mlprec/impl/mld_caggrmat_smth_asb.f90
+++ b/mlprec/impl/mld_caggrmat_smth_asb.f90
@@ -418,13 +418,7 @@ subroutine mld_caggrmat_smth_asb(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_rest
 
 9999 continue
   call psb_errpush(info,name)
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+  call psb_error_handler(err_act)
   return
 
-
-
 end subroutine mld_caggrmat_smth_asb
diff --git a/mlprec/impl/mld_ccoarse_bld.f90 b/mlprec/impl/mld_ccoarse_bld.f90
index bb9b091a..5cd3d740 100644
--- a/mlprec/impl/mld_ccoarse_bld.f90
+++ b/mlprec/impl/mld_ccoarse_bld.f90
@@ -146,12 +146,7 @@ subroutine mld_ccoarse_bld(a,desc_a,p,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
-  Return
+9999 call psb_error_handler(err_act)
+  return
 
 end subroutine mld_ccoarse_bld
diff --git a/mlprec/impl/mld_cilu0_fact.f90 b/mlprec/impl/mld_cilu0_fact.f90
index 17393c83..6a30c23c 100644
--- a/mlprec/impl/mld_cilu0_fact.f90
+++ b/mlprec/impl/mld_cilu0_fact.f90
@@ -201,12 +201,8 @@ subroutine mld_cilu0_fact(ialg,a,l,u,d,info,blck, upd)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 contains
@@ -475,13 +471,10 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
+
     return
+
   end subroutine mld_cilu0_factint
 
   !
@@ -661,13 +654,10 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
+
     return
+
   end subroutine ilu_copyin
 
 end subroutine mld_cilu0_fact
diff --git a/mlprec/impl/mld_ciluk_fact.f90 b/mlprec/impl/mld_ciluk_fact.f90
index 7daf066f..9215808e 100644
--- a/mlprec/impl/mld_ciluk_fact.f90
+++ b/mlprec/impl/mld_ciluk_fact.f90
@@ -193,12 +193,8 @@ subroutine mld_ciluk_fact(fill_in,ialg,a,l,u,d,info,blck)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-     call psb_error()
-     return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 contains
@@ -418,13 +414,9 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
     return
+
   end subroutine mld_ciluk_factint
 
   !
@@ -569,12 +561,7 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
     return
 
   end subroutine iluk_copyin
@@ -968,12 +955,8 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
+    return
 
   end subroutine iluk_copyout
 
diff --git a/mlprec/impl/mld_cilut_fact.f90 b/mlprec/impl/mld_cilut_fact.f90
index 4c077391..1b4be727 100644
--- a/mlprec/impl/mld_cilut_fact.f90
+++ b/mlprec/impl/mld_cilut_fact.f90
@@ -214,12 +214,7 @@ subroutine mld_cilut_fact(fill_in,thres,a,l,u,d,info,blck,iscale)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-     call psb_error()
-     return
-  end if
+9999 call psb_error_handler(err_act)
   return
 
 contains
@@ -425,13 +420,9 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
     return
+
   end subroutine mld_cilut_factint
 
   !
@@ -639,12 +630,7 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
     return
 
   end subroutine ilut_copyin
@@ -1186,12 +1172,8 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
+    return
 
   end subroutine ilut_copyout
 
diff --git a/mlprec/impl/mld_cmlprec_aply.f90 b/mlprec/impl/mld_cmlprec_aply.f90
index b67b95fa..487f8bee 100644
--- a/mlprec/impl/mld_cmlprec_aply.f90
+++ b/mlprec/impl/mld_cmlprec_aply.f90
@@ -394,12 +394,8 @@ subroutine mld_cmlprec_aply(alpha,p,x,beta,y,desc_data,trans,work,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 contains
@@ -965,12 +961,7 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
     return
 
   end subroutine inner_ml_aply
@@ -1088,12 +1079,8 @@ subroutine mld_cmlprec_aply_vect(alpha,p,x,beta,y,desc_data,trans,work,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 contains
@@ -1649,12 +1636,7 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
     return
 
   end subroutine inner_ml_aply
diff --git a/mlprec/impl/mld_cmlprec_bld.f90 b/mlprec/impl/mld_cmlprec_bld.f90
index 3e02d7dc..46a59927 100644
--- a/mlprec/impl/mld_cmlprec_bld.f90
+++ b/mlprec/impl/mld_cmlprec_bld.f90
@@ -514,14 +514,9 @@ subroutine mld_cmlprec_bld(a,desc_a,p,info,amold,vmold,imold)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
-  return
+9999 call psb_error_handler(err_act)
 
+  return
   
 contains
 
diff --git a/mlprec/impl/mld_cprecaply.f90 b/mlprec/impl/mld_cprecaply.f90
index eb2eda33..cfdba16d 100644
--- a/mlprec/impl/mld_cprecaply.f90
+++ b/mlprec/impl/mld_cprecaply.f90
@@ -163,12 +163,8 @@ subroutine mld_cprecaply(prec,x,y,desc_data,info,trans,work)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine mld_cprecaply
@@ -260,13 +256,9 @@ subroutine mld_cprecaply1(prec,x,desc_data,info,trans)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-     call psb_error()
-     return
-  end if
+9999 call psb_error_handler(err_act)
   return
+
 end subroutine mld_cprecaply1
 
 
@@ -365,12 +357,8 @@ subroutine mld_cprecaply2_vect(prec,x,y,desc_data,info,trans,work)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine mld_cprecaply2_vect
@@ -474,12 +462,8 @@ subroutine mld_cprecaply1_vect(prec,x,desc_data,info,trans,work)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine mld_cprecaply1_vect
diff --git a/mlprec/impl/mld_cprecbld.f90 b/mlprec/impl/mld_cprecbld.f90
index e1207f44..dcc30de9 100644
--- a/mlprec/impl/mld_cprecbld.f90
+++ b/mlprec/impl/mld_cprecbld.f90
@@ -204,13 +204,8 @@ subroutine mld_cprecbld(a,desc_a,p,info,amold,vmold,imold)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
-  return
+9999 call psb_error_handler(err_act)
 
+  return
 
 end subroutine mld_cprecbld
diff --git a/mlprec/impl/mld_cslu_bld.f90 b/mlprec/impl/mld_cslu_bld.f90
index 1230ce00..e05e42e1 100644
--- a/mlprec/impl/mld_cslu_bld.f90
+++ b/mlprec/impl/mld_cslu_bld.f90
@@ -119,13 +119,8 @@ subroutine mld_cslu_bld(a,desc_a,p,info)
 
   call psb_erractionrestore(err_act)
   return
-
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+ 
+9999 call psb_error_handler(err_act)
   return
 
 end subroutine mld_cslu_bld
diff --git a/mlprec/impl/mld_cslud_bld.f90 b/mlprec/impl/mld_cslud_bld.f90
index f03f2722..77acc09e 100644
--- a/mlprec/impl/mld_cslud_bld.f90
+++ b/mlprec/impl/mld_cslud_bld.f90
@@ -148,12 +148,7 @@ subroutine mld_csludist_bld(a,desc_a,p,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
   return
 
 end subroutine mld_csludist_bld
diff --git a/mlprec/impl/mld_csp_renum.f90 b/mlprec/impl/mld_csp_renum.f90
index 2a3ff68c..f3e7c801 100644
--- a/mlprec/impl/mld_csp_renum.f90
+++ b/mlprec/impl/mld_csp_renum.f90
@@ -254,12 +254,7 @@ subroutine mld_csp_renum(a,blck,p,atmp,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
   return
 
 contains
@@ -374,12 +369,7 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
     return
 
   end subroutine gps_reduction
diff --git a/mlprec/impl/mld_d_dec_map_bld.f90 b/mlprec/impl/mld_d_dec_map_bld.f90
index 19f93a31..37086ce8 100644
--- a/mlprec/impl/mld_d_dec_map_bld.f90
+++ b/mlprec/impl/mld_d_dec_map_bld.f90
@@ -319,12 +319,8 @@ subroutine mld_d_dec_map_bld(theta,a,desc_a,nlaggr,ilaggr,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine mld_d_dec_map_bld
diff --git a/mlprec/impl/mld_daggrmap_bld.f90 b/mlprec/impl/mld_daggrmap_bld.f90
index 49aeb9bd..9a90ac9b 100644
--- a/mlprec/impl/mld_daggrmap_bld.f90
+++ b/mlprec/impl/mld_daggrmap_bld.f90
@@ -153,12 +153,8 @@ subroutine mld_daggrmap_bld(aggr_type,theta,a,desc_a,ilaggr,nlaggr,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine mld_daggrmap_bld
diff --git a/mlprec/impl/mld_daggrmat_asb.f90 b/mlprec/impl/mld_daggrmat_asb.f90
index 57533916..158f5357 100644
--- a/mlprec/impl/mld_daggrmat_asb.f90
+++ b/mlprec/impl/mld_daggrmat_asb.f90
@@ -259,10 +259,7 @@ subroutine mld_daggrmat_asb(a,desc_a,ilaggr,nlaggr,p,info)
   !  op_restr => PR^T   i.e. restriction  operator
   !  op_prol => PR     i.e. prolongation operator
   !  
-!!$  write(0,*) 'allocated DSC_AC ',allocated(p%desc_ac%v_halo_index%v),&
-!!$       & allocated(p%desc_ac%v_ext_index%v),&
-!!$       & allocated(p%desc_ac%v_ovrlap_index%v),&
-!!$       &allocated(p%desc_ac%v_ovr_mst_idx%v)
+
   p%map = psb_linmap(psb_map_aggr_,desc_a,&
        & p%desc_ac,op_restr,op_prol,ilaggr,nlaggr)
   if (info == psb_success_) call op_prol%free()
@@ -276,12 +273,8 @@ subroutine mld_daggrmat_asb(a,desc_a,ilaggr,nlaggr,p,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine mld_daggrmat_asb
diff --git a/mlprec/impl/mld_daggrmat_biz_asb.f90 b/mlprec/impl/mld_daggrmat_biz_asb.f90
index 1f356d91..27e06afa 100644
--- a/mlprec/impl/mld_daggrmat_biz_asb.f90
+++ b/mlprec/impl/mld_daggrmat_biz_asb.f90
@@ -404,13 +404,8 @@ subroutine mld_daggrmat_biz_asb(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_restr
 
 9999 continue
   call psb_errpush(info,name)
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
-  return
-
 
+  call psb_error_handler(err_act)
+  return
 
 end subroutine mld_daggrmat_biz_asb
diff --git a/mlprec/impl/mld_daggrmat_minnrg_asb.f90 b/mlprec/impl/mld_daggrmat_minnrg_asb.f90
index 29587b9d..ee997fb7 100644
--- a/mlprec/impl/mld_daggrmat_minnrg_asb.f90
+++ b/mlprec/impl/mld_daggrmat_minnrg_asb.f90
@@ -593,11 +593,7 @@ subroutine mld_daggrmat_minnrg_asb(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_re
 
 9999 continue
   call psb_errpush(info,name)
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+  call psb_error_handler(err_act)
   return
 
 
diff --git a/mlprec/impl/mld_daggrmat_nosmth_asb.f90 b/mlprec/impl/mld_daggrmat_nosmth_asb.f90
index 9e6b3d93..9eafbb99 100644
--- a/mlprec/impl/mld_daggrmat_nosmth_asb.f90
+++ b/mlprec/impl/mld_daggrmat_nosmth_asb.f90
@@ -175,12 +175,8 @@ subroutine mld_daggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_re
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine mld_daggrmat_nosmth_asb
diff --git a/mlprec/impl/mld_daggrmat_smth_asb.f90 b/mlprec/impl/mld_daggrmat_smth_asb.f90
index f5490d6f..1bce1c80 100644
--- a/mlprec/impl/mld_daggrmat_smth_asb.f90
+++ b/mlprec/impl/mld_daggrmat_smth_asb.f90
@@ -418,13 +418,7 @@ subroutine mld_daggrmat_smth_asb(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_rest
 
 9999 continue
   call psb_errpush(info,name)
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+  call psb_error_handler(err_act)
   return
 
-
-
 end subroutine mld_daggrmat_smth_asb
diff --git a/mlprec/impl/mld_dcoarse_bld.f90 b/mlprec/impl/mld_dcoarse_bld.f90
index 763484db..0d3cb118 100644
--- a/mlprec/impl/mld_dcoarse_bld.f90
+++ b/mlprec/impl/mld_dcoarse_bld.f90
@@ -146,12 +146,7 @@ subroutine mld_dcoarse_bld(a,desc_a,p,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
-  Return
+9999 call psb_error_handler(err_act)
+  return
 
 end subroutine mld_dcoarse_bld
diff --git a/mlprec/impl/mld_dilu0_fact.f90 b/mlprec/impl/mld_dilu0_fact.f90
index 087b8794..529ade5f 100644
--- a/mlprec/impl/mld_dilu0_fact.f90
+++ b/mlprec/impl/mld_dilu0_fact.f90
@@ -201,12 +201,8 @@ subroutine mld_dilu0_fact(ialg,a,l,u,d,info,blck, upd)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 contains
@@ -475,13 +471,10 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
+
     return
+
   end subroutine mld_dilu0_factint
 
   !
@@ -661,13 +654,10 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
+
     return
+
   end subroutine ilu_copyin
 
 end subroutine mld_dilu0_fact
diff --git a/mlprec/impl/mld_diluk_fact.f90 b/mlprec/impl/mld_diluk_fact.f90
index 752899a0..e582850f 100644
--- a/mlprec/impl/mld_diluk_fact.f90
+++ b/mlprec/impl/mld_diluk_fact.f90
@@ -193,12 +193,8 @@ subroutine mld_diluk_fact(fill_in,ialg,a,l,u,d,info,blck)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-     call psb_error()
-     return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 contains
@@ -418,13 +414,9 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
     return
+
   end subroutine mld_diluk_factint
 
   !
@@ -569,12 +561,7 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
     return
 
   end subroutine iluk_copyin
@@ -968,12 +955,8 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
+    return
 
   end subroutine iluk_copyout
 
diff --git a/mlprec/impl/mld_dilut_fact.f90 b/mlprec/impl/mld_dilut_fact.f90
index 243cf251..770cd7ec 100644
--- a/mlprec/impl/mld_dilut_fact.f90
+++ b/mlprec/impl/mld_dilut_fact.f90
@@ -214,12 +214,7 @@ subroutine mld_dilut_fact(fill_in,thres,a,l,u,d,info,blck,iscale)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-     call psb_error()
-     return
-  end if
+9999 call psb_error_handler(err_act)
   return
 
 contains
@@ -425,13 +420,9 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
     return
+
   end subroutine mld_dilut_factint
 
   !
@@ -639,12 +630,7 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
     return
 
   end subroutine ilut_copyin
@@ -1186,12 +1172,8 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
+    return
 
   end subroutine ilut_copyout
 
diff --git a/mlprec/impl/mld_dmlprec_aply.f90 b/mlprec/impl/mld_dmlprec_aply.f90
index 8228a299..bcb386bd 100644
--- a/mlprec/impl/mld_dmlprec_aply.f90
+++ b/mlprec/impl/mld_dmlprec_aply.f90
@@ -394,12 +394,8 @@ subroutine mld_dmlprec_aply(alpha,p,x,beta,y,desc_data,trans,work,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 contains
@@ -965,12 +961,7 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
     return
 
   end subroutine inner_ml_aply
@@ -1088,12 +1079,8 @@ subroutine mld_dmlprec_aply_vect(alpha,p,x,beta,y,desc_data,trans,work,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 contains
@@ -1649,12 +1636,7 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
     return
 
   end subroutine inner_ml_aply
diff --git a/mlprec/impl/mld_dmlprec_bld.f90 b/mlprec/impl/mld_dmlprec_bld.f90
index aac694a4..9b9cffed 100644
--- a/mlprec/impl/mld_dmlprec_bld.f90
+++ b/mlprec/impl/mld_dmlprec_bld.f90
@@ -514,14 +514,9 @@ subroutine mld_dmlprec_bld(a,desc_a,p,info,amold,vmold,imold)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
-  return
+9999 call psb_error_handler(err_act)
 
+  return
   
 contains
 
diff --git a/mlprec/impl/mld_dprecaply.f90 b/mlprec/impl/mld_dprecaply.f90
index 4b679425..a291ac24 100644
--- a/mlprec/impl/mld_dprecaply.f90
+++ b/mlprec/impl/mld_dprecaply.f90
@@ -163,12 +163,8 @@ subroutine mld_dprecaply(prec,x,y,desc_data,info,trans,work)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine mld_dprecaply
@@ -260,13 +256,9 @@ subroutine mld_dprecaply1(prec,x,desc_data,info,trans)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-     call psb_error()
-     return
-  end if
+9999 call psb_error_handler(err_act)
   return
+
 end subroutine mld_dprecaply1
 
 
@@ -365,12 +357,8 @@ subroutine mld_dprecaply2_vect(prec,x,y,desc_data,info,trans,work)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine mld_dprecaply2_vect
@@ -474,12 +462,8 @@ subroutine mld_dprecaply1_vect(prec,x,desc_data,info,trans,work)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine mld_dprecaply1_vect
diff --git a/mlprec/impl/mld_dprecbld.f90 b/mlprec/impl/mld_dprecbld.f90
index b0e22eae..a21eec17 100644
--- a/mlprec/impl/mld_dprecbld.f90
+++ b/mlprec/impl/mld_dprecbld.f90
@@ -176,7 +176,7 @@ subroutine mld_dprecbld(a,desc_a,p,info,amold,vmold,imold)
 
       call p%precv(1)%sm%build(a,desc_a,upd_,info,&
            & amold=amold,vmold=vmold,imold=imold)
-    if ((info /= psb_success_).or.psb_errstatus_fatal()) then 
+      if (info /= psb_success_) then 
         call psb_errpush(psb_err_internal_error_,name,&
              & a_err='One level preconditioner build.')
         goto 9999
@@ -192,7 +192,7 @@ subroutine mld_dprecbld(a,desc_a,p,info,amold,vmold,imold)
     call  mld_mlprec_bld(a,desc_a,p,info,&
          & amold=amold,vmold=vmold,imold=imold)
 
-    if ((info /= psb_success_).or.psb_errstatus_fatal()) then 
+    if (info /= psb_success_) then 
       call psb_errpush(psb_err_internal_error_,name,&
            & a_err='Multilevel preconditioner build.')
       goto 9999
@@ -204,13 +204,8 @@ subroutine mld_dprecbld(a,desc_a,p,info,amold,vmold,imold)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
-  return
+9999 call psb_error_handler(err_act)
 
+  return
 
 end subroutine mld_dprecbld
diff --git a/mlprec/impl/mld_dslu_bld.f90 b/mlprec/impl/mld_dslu_bld.f90
index 6f6a21e2..5d26a8e8 100644
--- a/mlprec/impl/mld_dslu_bld.f90
+++ b/mlprec/impl/mld_dslu_bld.f90
@@ -120,12 +120,7 @@ subroutine mld_dslu_bld(a,desc_a,p,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
   return
 
 end subroutine mld_dslu_bld
diff --git a/mlprec/impl/mld_dslud_bld.f90 b/mlprec/impl/mld_dslud_bld.f90
index 7ebb5263..45ea358c 100644
--- a/mlprec/impl/mld_dslud_bld.f90
+++ b/mlprec/impl/mld_dslud_bld.f90
@@ -148,12 +148,7 @@ subroutine mld_dsludist_bld(a,desc_a,p,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
   return
 
 end subroutine mld_dsludist_bld
diff --git a/mlprec/impl/mld_dsp_renum.f90 b/mlprec/impl/mld_dsp_renum.f90
index 342d4ace..0f033749 100644
--- a/mlprec/impl/mld_dsp_renum.f90
+++ b/mlprec/impl/mld_dsp_renum.f90
@@ -254,12 +254,7 @@ subroutine mld_dsp_renum(a,blck,p,atmp,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
   return
 
 contains
@@ -374,12 +369,7 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
     return
 
   end subroutine gps_reduction
diff --git a/mlprec/impl/mld_s_dec_map_bld.f90 b/mlprec/impl/mld_s_dec_map_bld.f90
index 44a228f9..b1e871ca 100644
--- a/mlprec/impl/mld_s_dec_map_bld.f90
+++ b/mlprec/impl/mld_s_dec_map_bld.f90
@@ -319,12 +319,8 @@ subroutine mld_s_dec_map_bld(theta,a,desc_a,nlaggr,ilaggr,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine mld_s_dec_map_bld
diff --git a/mlprec/impl/mld_saggrmap_bld.f90 b/mlprec/impl/mld_saggrmap_bld.f90
index 33e7f69c..dcccc9e7 100644
--- a/mlprec/impl/mld_saggrmap_bld.f90
+++ b/mlprec/impl/mld_saggrmap_bld.f90
@@ -153,12 +153,8 @@ subroutine mld_saggrmap_bld(aggr_type,theta,a,desc_a,ilaggr,nlaggr,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine mld_saggrmap_bld
diff --git a/mlprec/impl/mld_saggrmat_asb.f90 b/mlprec/impl/mld_saggrmat_asb.f90
index 91506617..9703b556 100644
--- a/mlprec/impl/mld_saggrmat_asb.f90
+++ b/mlprec/impl/mld_saggrmat_asb.f90
@@ -273,12 +273,8 @@ subroutine mld_saggrmat_asb(a,desc_a,ilaggr,nlaggr,p,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine mld_saggrmat_asb
diff --git a/mlprec/impl/mld_saggrmat_biz_asb.f90 b/mlprec/impl/mld_saggrmat_biz_asb.f90
index 53d22ffa..214cc81e 100644
--- a/mlprec/impl/mld_saggrmat_biz_asb.f90
+++ b/mlprec/impl/mld_saggrmat_biz_asb.f90
@@ -404,13 +404,8 @@ subroutine mld_saggrmat_biz_asb(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_restr
 
 9999 continue
   call psb_errpush(info,name)
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
-  return
-
 
+  call psb_error_handler(err_act)
+  return
 
 end subroutine mld_saggrmat_biz_asb
diff --git a/mlprec/impl/mld_saggrmat_minnrg_asb.f90 b/mlprec/impl/mld_saggrmat_minnrg_asb.f90
index b9bf78f1..658415cf 100644
--- a/mlprec/impl/mld_saggrmat_minnrg_asb.f90
+++ b/mlprec/impl/mld_saggrmat_minnrg_asb.f90
@@ -593,11 +593,7 @@ subroutine mld_saggrmat_minnrg_asb(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_re
 
 9999 continue
   call psb_errpush(info,name)
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+  call psb_error_handler(err_act)
   return
 
 
diff --git a/mlprec/impl/mld_saggrmat_nosmth_asb.f90 b/mlprec/impl/mld_saggrmat_nosmth_asb.f90
index bfce6a30..5471d32e 100644
--- a/mlprec/impl/mld_saggrmat_nosmth_asb.f90
+++ b/mlprec/impl/mld_saggrmat_nosmth_asb.f90
@@ -175,12 +175,8 @@ subroutine mld_saggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_re
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine mld_saggrmat_nosmth_asb
diff --git a/mlprec/impl/mld_saggrmat_smth_asb.f90 b/mlprec/impl/mld_saggrmat_smth_asb.f90
index af71ad21..ab858f85 100644
--- a/mlprec/impl/mld_saggrmat_smth_asb.f90
+++ b/mlprec/impl/mld_saggrmat_smth_asb.f90
@@ -418,13 +418,7 @@ subroutine mld_saggrmat_smth_asb(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_rest
 
 9999 continue
   call psb_errpush(info,name)
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+  call psb_error_handler(err_act)
   return
 
-
-
 end subroutine mld_saggrmat_smth_asb
diff --git a/mlprec/impl/mld_scoarse_bld.f90 b/mlprec/impl/mld_scoarse_bld.f90
index 370ce248..9445f67b 100644
--- a/mlprec/impl/mld_scoarse_bld.f90
+++ b/mlprec/impl/mld_scoarse_bld.f90
@@ -146,12 +146,7 @@ subroutine mld_scoarse_bld(a,desc_a,p,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
-  Return
+9999 call psb_error_handler(err_act)
+  return
 
 end subroutine mld_scoarse_bld
diff --git a/mlprec/impl/mld_silu0_fact.f90 b/mlprec/impl/mld_silu0_fact.f90
index 4f54b9d4..177cdba9 100644
--- a/mlprec/impl/mld_silu0_fact.f90
+++ b/mlprec/impl/mld_silu0_fact.f90
@@ -201,12 +201,8 @@ subroutine mld_silu0_fact(ialg,a,l,u,d,info,blck, upd)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 contains
@@ -475,13 +471,10 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
+
     return
+
   end subroutine mld_silu0_factint
 
   !
@@ -661,13 +654,10 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
+
     return
+
   end subroutine ilu_copyin
 
 end subroutine mld_silu0_fact
diff --git a/mlprec/impl/mld_siluk_fact.f90 b/mlprec/impl/mld_siluk_fact.f90
index f09fcd89..e3ad7cd5 100644
--- a/mlprec/impl/mld_siluk_fact.f90
+++ b/mlprec/impl/mld_siluk_fact.f90
@@ -193,12 +193,8 @@ subroutine mld_siluk_fact(fill_in,ialg,a,l,u,d,info,blck)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-     call psb_error()
-     return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 contains
@@ -418,13 +414,9 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
     return
+
   end subroutine mld_siluk_factint
 
   !
@@ -569,12 +561,7 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
     return
 
   end subroutine iluk_copyin
@@ -968,12 +955,8 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
+    return
 
   end subroutine iluk_copyout
 
diff --git a/mlprec/impl/mld_silut_fact.f90 b/mlprec/impl/mld_silut_fact.f90
index 71709b6b..80fb6aa6 100644
--- a/mlprec/impl/mld_silut_fact.f90
+++ b/mlprec/impl/mld_silut_fact.f90
@@ -214,12 +214,7 @@ subroutine mld_silut_fact(fill_in,thres,a,l,u,d,info,blck,iscale)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-     call psb_error()
-     return
-  end if
+9999 call psb_error_handler(err_act)
   return
 
 contains
@@ -425,13 +420,9 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
     return
+
   end subroutine mld_silut_factint
 
   !
@@ -639,12 +630,7 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
     return
 
   end subroutine ilut_copyin
@@ -1186,12 +1172,8 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
+    return
 
   end subroutine ilut_copyout
 
diff --git a/mlprec/impl/mld_smlprec_aply.f90 b/mlprec/impl/mld_smlprec_aply.f90
index 50e2df3d..9f19ea18 100644
--- a/mlprec/impl/mld_smlprec_aply.f90
+++ b/mlprec/impl/mld_smlprec_aply.f90
@@ -394,12 +394,8 @@ subroutine mld_smlprec_aply(alpha,p,x,beta,y,desc_data,trans,work,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 contains
@@ -965,12 +961,7 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
     return
 
   end subroutine inner_ml_aply
@@ -1088,12 +1079,8 @@ subroutine mld_smlprec_aply_vect(alpha,p,x,beta,y,desc_data,trans,work,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 contains
@@ -1649,12 +1636,7 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
     return
 
   end subroutine inner_ml_aply
diff --git a/mlprec/impl/mld_smlprec_bld.f90 b/mlprec/impl/mld_smlprec_bld.f90
index 0f399253..b94a8e95 100644
--- a/mlprec/impl/mld_smlprec_bld.f90
+++ b/mlprec/impl/mld_smlprec_bld.f90
@@ -514,14 +514,9 @@ subroutine mld_smlprec_bld(a,desc_a,p,info,amold,vmold,imold)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
-  return
+9999 call psb_error_handler(err_act)
 
+  return
   
 contains
 
diff --git a/mlprec/impl/mld_sprecaply.f90 b/mlprec/impl/mld_sprecaply.f90
index fa079c35..29bc2a95 100644
--- a/mlprec/impl/mld_sprecaply.f90
+++ b/mlprec/impl/mld_sprecaply.f90
@@ -163,12 +163,8 @@ subroutine mld_sprecaply(prec,x,y,desc_data,info,trans,work)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine mld_sprecaply
@@ -260,13 +256,9 @@ subroutine mld_sprecaply1(prec,x,desc_data,info,trans)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-     call psb_error()
-     return
-  end if
+9999 call psb_error_handler(err_act)
   return
+
 end subroutine mld_sprecaply1
 
 
@@ -365,12 +357,8 @@ subroutine mld_sprecaply2_vect(prec,x,y,desc_data,info,trans,work)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine mld_sprecaply2_vect
@@ -474,12 +462,8 @@ subroutine mld_sprecaply1_vect(prec,x,desc_data,info,trans,work)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine mld_sprecaply1_vect
diff --git a/mlprec/impl/mld_sprecbld.f90 b/mlprec/impl/mld_sprecbld.f90
index b16d13c2..a3620201 100644
--- a/mlprec/impl/mld_sprecbld.f90
+++ b/mlprec/impl/mld_sprecbld.f90
@@ -204,13 +204,8 @@ subroutine mld_sprecbld(a,desc_a,p,info,amold,vmold,imold)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
-  return
+9999 call psb_error_handler(err_act)
 
+  return
 
 end subroutine mld_sprecbld
diff --git a/mlprec/impl/mld_sslu_bld.f90 b/mlprec/impl/mld_sslu_bld.f90
index 4b2d2d1e..168a428b 100644
--- a/mlprec/impl/mld_sslu_bld.f90
+++ b/mlprec/impl/mld_sslu_bld.f90
@@ -120,12 +120,7 @@ subroutine mld_sslu_bld(a,desc_a,p,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
   return
 
 end subroutine mld_sslu_bld
diff --git a/mlprec/impl/mld_sslud_bld.f90 b/mlprec/impl/mld_sslud_bld.f90
index dc24befa..247d20fc 100644
--- a/mlprec/impl/mld_sslud_bld.f90
+++ b/mlprec/impl/mld_sslud_bld.f90
@@ -148,12 +148,7 @@ subroutine mld_ssludist_bld(a,desc_a,p,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
   return
 
 end subroutine mld_ssludist_bld
diff --git a/mlprec/impl/mld_ssp_renum.f90 b/mlprec/impl/mld_ssp_renum.f90
index 3fc43bf2..abce47b4 100644
--- a/mlprec/impl/mld_ssp_renum.f90
+++ b/mlprec/impl/mld_ssp_renum.f90
@@ -254,12 +254,7 @@ subroutine mld_ssp_renum(a,blck,p,atmp,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
   return
 
 contains
@@ -374,12 +369,7 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
     return
 
   end subroutine gps_reduction
diff --git a/mlprec/impl/mld_z_dec_map_bld.f90 b/mlprec/impl/mld_z_dec_map_bld.f90
index 09faee11..058d921a 100644
--- a/mlprec/impl/mld_z_dec_map_bld.f90
+++ b/mlprec/impl/mld_z_dec_map_bld.f90
@@ -319,12 +319,8 @@ subroutine mld_z_dec_map_bld(theta,a,desc_a,nlaggr,ilaggr,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine mld_z_dec_map_bld
diff --git a/mlprec/impl/mld_z_onelev_impl.f90 b/mlprec/impl/mld_z_onelev_impl.f90
index c83e4da1..5f7af21a 100644
--- a/mlprec/impl/mld_z_onelev_impl.f90
+++ b/mlprec/impl/mld_z_onelev_impl.f90
@@ -113,13 +113,9 @@ subroutine mld_z_base_onelev_descr(lv,il,nl,info,iout)
   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 mld_z_base_onelev_descr
 
 
@@ -210,12 +206,7 @@ subroutine mld_z_base_onelev_check(lv,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 mld_z_base_onelev_check
 
@@ -296,12 +287,7 @@ subroutine mld_z_base_onelev_seti(lv,what,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
 end subroutine mld_z_base_onelev_seti
 
@@ -332,12 +318,7 @@ subroutine mld_z_base_onelev_setc(lv,what,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
 end subroutine mld_z_base_onelev_setc
 
@@ -378,12 +359,7 @@ subroutine mld_z_base_onelev_setr(lv,what,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
 end subroutine mld_z_base_onelev_setr
 
diff --git a/mlprec/impl/mld_zaggrmap_bld.f90 b/mlprec/impl/mld_zaggrmap_bld.f90
index e50ed152..5c8d3c02 100644
--- a/mlprec/impl/mld_zaggrmap_bld.f90
+++ b/mlprec/impl/mld_zaggrmap_bld.f90
@@ -153,12 +153,8 @@ subroutine mld_zaggrmap_bld(aggr_type,theta,a,desc_a,ilaggr,nlaggr,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine mld_zaggrmap_bld
diff --git a/mlprec/impl/mld_zaggrmat_asb.f90 b/mlprec/impl/mld_zaggrmat_asb.f90
index 67117689..621dff7a 100644
--- a/mlprec/impl/mld_zaggrmat_asb.f90
+++ b/mlprec/impl/mld_zaggrmat_asb.f90
@@ -273,12 +273,8 @@ subroutine mld_zaggrmat_asb(a,desc_a,ilaggr,nlaggr,p,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine mld_zaggrmat_asb
diff --git a/mlprec/impl/mld_zaggrmat_biz_asb.f90 b/mlprec/impl/mld_zaggrmat_biz_asb.f90
index 9a276920..884c48c9 100644
--- a/mlprec/impl/mld_zaggrmat_biz_asb.f90
+++ b/mlprec/impl/mld_zaggrmat_biz_asb.f90
@@ -404,13 +404,8 @@ subroutine mld_zaggrmat_biz_asb(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_restr
 
 9999 continue
   call psb_errpush(info,name)
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
-  return
-
 
+  call psb_error_handler(err_act)
+  return
 
 end subroutine mld_zaggrmat_biz_asb
diff --git a/mlprec/impl/mld_zaggrmat_minnrg_asb.f90 b/mlprec/impl/mld_zaggrmat_minnrg_asb.f90
index 752fe67e..713517cb 100644
--- a/mlprec/impl/mld_zaggrmat_minnrg_asb.f90
+++ b/mlprec/impl/mld_zaggrmat_minnrg_asb.f90
@@ -593,11 +593,7 @@ subroutine mld_zaggrmat_minnrg_asb(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_re
 
 9999 continue
   call psb_errpush(info,name)
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+  call psb_error_handler(err_act)
   return
 
 
diff --git a/mlprec/impl/mld_zaggrmat_nosmth_asb.f90 b/mlprec/impl/mld_zaggrmat_nosmth_asb.f90
index efb31bb8..a10af7df 100644
--- a/mlprec/impl/mld_zaggrmat_nosmth_asb.f90
+++ b/mlprec/impl/mld_zaggrmat_nosmth_asb.f90
@@ -175,12 +175,8 @@ subroutine mld_zaggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_re
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine mld_zaggrmat_nosmth_asb
diff --git a/mlprec/impl/mld_zaggrmat_smth_asb.f90 b/mlprec/impl/mld_zaggrmat_smth_asb.f90
index 368b49ea..795f110a 100644
--- a/mlprec/impl/mld_zaggrmat_smth_asb.f90
+++ b/mlprec/impl/mld_zaggrmat_smth_asb.f90
@@ -418,13 +418,7 @@ subroutine mld_zaggrmat_smth_asb(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_rest
 
 9999 continue
   call psb_errpush(info,name)
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+  call psb_error_handler(err_act)
   return
 
-
-
 end subroutine mld_zaggrmat_smth_asb
diff --git a/mlprec/impl/mld_zcoarse_bld.f90 b/mlprec/impl/mld_zcoarse_bld.f90
index 41ae7f5d..bab52d0b 100644
--- a/mlprec/impl/mld_zcoarse_bld.f90
+++ b/mlprec/impl/mld_zcoarse_bld.f90
@@ -146,12 +146,8 @@ subroutine mld_zcoarse_bld(a,desc_a,p,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
-  Return
+9999 call psb_error_handler(err_act)
+
+  return
 
 end subroutine mld_zcoarse_bld
diff --git a/mlprec/impl/mld_zilu0_fact.f90 b/mlprec/impl/mld_zilu0_fact.f90
index 91fd5b39..8db9567d 100644
--- a/mlprec/impl/mld_zilu0_fact.f90
+++ b/mlprec/impl/mld_zilu0_fact.f90
@@ -201,12 +201,8 @@ subroutine mld_zilu0_fact(ialg,a,l,u,d,info,blck, upd)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 contains
@@ -475,13 +471,10 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
+
     return
+
   end subroutine mld_zilu0_factint
 
   !
@@ -661,13 +654,10 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
+
     return
+
   end subroutine ilu_copyin
 
 end subroutine mld_zilu0_fact
diff --git a/mlprec/impl/mld_ziluk_fact.f90 b/mlprec/impl/mld_ziluk_fact.f90
index f7fd3843..43135e57 100644
--- a/mlprec/impl/mld_ziluk_fact.f90
+++ b/mlprec/impl/mld_ziluk_fact.f90
@@ -193,12 +193,8 @@ subroutine mld_ziluk_fact(fill_in,ialg,a,l,u,d,info,blck)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-     call psb_error()
-     return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 contains
@@ -418,13 +414,9 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
     return
+
   end subroutine mld_ziluk_factint
 
   !
@@ -569,12 +561,7 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
     return
 
   end subroutine iluk_copyin
@@ -968,12 +955,8 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
+    return
 
   end subroutine iluk_copyout
 
diff --git a/mlprec/impl/mld_zilut_fact.f90 b/mlprec/impl/mld_zilut_fact.f90
index 86216d46..d25fafb8 100644
--- a/mlprec/impl/mld_zilut_fact.f90
+++ b/mlprec/impl/mld_zilut_fact.f90
@@ -214,12 +214,7 @@ subroutine mld_zilut_fact(fill_in,thres,a,l,u,d,info,blck,iscale)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-     call psb_error()
-     return
-  end if
+9999 call psb_error_handler(err_act)
   return
 
 contains
@@ -425,13 +420,9 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
     return
+
   end subroutine mld_zilut_factint
 
   !
@@ -639,12 +630,7 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
     return
 
   end subroutine ilut_copyin
@@ -1186,12 +1172,8 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
+    return
 
   end subroutine ilut_copyout
 
diff --git a/mlprec/impl/mld_zmlprec_aply.f90 b/mlprec/impl/mld_zmlprec_aply.f90
index 941fdf13..025b3602 100644
--- a/mlprec/impl/mld_zmlprec_aply.f90
+++ b/mlprec/impl/mld_zmlprec_aply.f90
@@ -394,12 +394,8 @@ subroutine mld_zmlprec_aply(alpha,p,x,beta,y,desc_data,trans,work,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 contains
@@ -965,12 +961,7 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
     return
 
   end subroutine inner_ml_aply
@@ -1088,12 +1079,8 @@ subroutine mld_zmlprec_aply_vect(alpha,p,x,beta,y,desc_data,trans,work,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 contains
@@ -1649,12 +1636,7 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
     return
 
   end subroutine inner_ml_aply
diff --git a/mlprec/impl/mld_zmlprec_bld.f90 b/mlprec/impl/mld_zmlprec_bld.f90
index df511e9a..e2b75880 100644
--- a/mlprec/impl/mld_zmlprec_bld.f90
+++ b/mlprec/impl/mld_zmlprec_bld.f90
@@ -514,14 +514,9 @@ subroutine mld_zmlprec_bld(a,desc_a,p,info,amold,vmold,imold)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
-  return
+9999 call psb_error_handler(err_act)
 
+  return
   
 contains
 
diff --git a/mlprec/impl/mld_zprecaply.f90 b/mlprec/impl/mld_zprecaply.f90
index 5067d546..a8b4e859 100644
--- a/mlprec/impl/mld_zprecaply.f90
+++ b/mlprec/impl/mld_zprecaply.f90
@@ -163,12 +163,8 @@ subroutine mld_zprecaply(prec,x,y,desc_data,info,trans,work)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine mld_zprecaply
@@ -260,13 +256,9 @@ subroutine mld_zprecaply1(prec,x,desc_data,info,trans)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-     call psb_error()
-     return
-  end if
+9999 call psb_error_handler(err_act)
   return
+
 end subroutine mld_zprecaply1
 
 
@@ -365,12 +357,8 @@ subroutine mld_zprecaply2_vect(prec,x,y,desc_data,info,trans,work)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine mld_zprecaply2_vect
@@ -474,12 +462,8 @@ subroutine mld_zprecaply1_vect(prec,x,desc_data,info,trans,work)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine mld_zprecaply1_vect
diff --git a/mlprec/impl/mld_zprecbld.f90 b/mlprec/impl/mld_zprecbld.f90
index d7976e40..32c4bd7b 100644
--- a/mlprec/impl/mld_zprecbld.f90
+++ b/mlprec/impl/mld_zprecbld.f90
@@ -204,13 +204,8 @@ subroutine mld_zprecbld(a,desc_a,p,info,amold,vmold,imold)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
-  return
+9999 call psb_error_handler(err_act)
 
+  return
 
 end subroutine mld_zprecbld
diff --git a/mlprec/impl/mld_zslu_bld.f90 b/mlprec/impl/mld_zslu_bld.f90
index 7ef6b682..b0498623 100644
--- a/mlprec/impl/mld_zslu_bld.f90
+++ b/mlprec/impl/mld_zslu_bld.f90
@@ -120,12 +120,7 @@ subroutine mld_zslu_bld(a,desc_a,p,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
   return
 
 end subroutine mld_zslu_bld
diff --git a/mlprec/impl/mld_zslud_bld.f90 b/mlprec/impl/mld_zslud_bld.f90
index 1a8795c9..f547efb2 100644
--- a/mlprec/impl/mld_zslud_bld.f90
+++ b/mlprec/impl/mld_zslud_bld.f90
@@ -148,12 +148,8 @@ subroutine mld_zsludist_bld(a,desc_a,p,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine mld_zsludist_bld
diff --git a/mlprec/impl/mld_zsp_renum.f90 b/mlprec/impl/mld_zsp_renum.f90
index d6ab6544..80fb17ab 100644
--- a/mlprec/impl/mld_zsp_renum.f90
+++ b/mlprec/impl/mld_zsp_renum.f90
@@ -254,12 +254,7 @@ subroutine mld_zsp_renum(a,blck,p,atmp,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act.eq.psb_act_abort_) then
-    call psb_error()
-    return
-  end if
+9999 call psb_error_handler(err_act)
   return
 
 contains
@@ -374,12 +369,7 @@ contains
     call psb_erractionrestore(err_act)
     return
 
-9999 continue
-    call psb_erractionrestore(err_act)
-    if (err_act.eq.psb_act_abort_) then
-      call psb_error()
-      return
-    end if
+9999 call psb_error_handler(err_act)
     return
 
   end subroutine gps_reduction
diff --git a/mlprec/impl/smoother/mld_c_as_smoother_apply.f90 b/mlprec/impl/smoother/mld_c_as_smoother_apply.f90
index b1124cbf..f7189af9 100644
--- a/mlprec/impl/smoother/mld_c_as_smoother_apply.f90
+++ b/mlprec/impl/smoother/mld_c_as_smoother_apply.f90
@@ -476,12 +476,8 @@ subroutine mld_c_as_smoother_apply(alpha,sm,x,beta,y,desc_data,trans,sweeps,work
   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 mld_c_as_smoother_apply
diff --git a/mlprec/impl/smoother/mld_c_as_smoother_apply_vect.f90 b/mlprec/impl/smoother/mld_c_as_smoother_apply_vect.f90
index bf78a83c..3a0b86f7 100644
--- a/mlprec/impl/smoother/mld_c_as_smoother_apply_vect.f90
+++ b/mlprec/impl/smoother/mld_c_as_smoother_apply_vect.f90
@@ -495,12 +495,8 @@ subroutine mld_c_as_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,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
 
 end subroutine mld_c_as_smoother_apply_vect
diff --git a/mlprec/impl/smoother/mld_c_as_smoother_bld.f90 b/mlprec/impl/smoother/mld_c_as_smoother_bld.f90
index 737a56d5..07bc5076 100644
--- a/mlprec/impl/smoother/mld_c_as_smoother_bld.f90
+++ b/mlprec/impl/smoother/mld_c_as_smoother_bld.f90
@@ -185,11 +185,7 @@ subroutine mld_c_as_smoother_bld(a,desc_a,sm,upd,info,amold,vmold,imold)
   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 mld_c_as_smoother_bld
diff --git a/mlprec/impl/smoother/mld_c_as_smoother_check.f90 b/mlprec/impl/smoother/mld_c_as_smoother_check.f90
index e0f61b07..be8197c8 100644
--- a/mlprec/impl/smoother/mld_c_as_smoother_check.f90
+++ b/mlprec/impl/smoother/mld_c_as_smoother_check.f90
@@ -73,11 +73,7 @@ subroutine mld_c_as_smoother_check(sm,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 mld_c_as_smoother_check
diff --git a/mlprec/impl/smoother/mld_c_as_smoother_clone.f90 b/mlprec/impl/smoother/mld_c_as_smoother_clone.f90
index 59b54d29..ee921149 100644
--- a/mlprec/impl/smoother/mld_c_as_smoother_clone.f90
+++ b/mlprec/impl/smoother/mld_c_as_smoother_clone.f90
@@ -88,11 +88,7 @@ subroutine mld_c_as_smoother_clone(sm,smout,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 mld_c_as_smoother_clone
diff --git a/mlprec/impl/smoother/mld_c_as_smoother_cnv.f90 b/mlprec/impl/smoother/mld_c_as_smoother_cnv.f90
index 8ea42b1d..b58bb091 100644
--- a/mlprec/impl/smoother/mld_c_as_smoother_cnv.f90
+++ b/mlprec/impl/smoother/mld_c_as_smoother_cnv.f90
@@ -91,11 +91,7 @@ subroutine mld_c_as_smoother_cnv(sm,info,amold,vmold,imold)
   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 mld_c_as_smoother_cnv
diff --git a/mlprec/impl/smoother/mld_c_as_smoother_csetc.f90 b/mlprec/impl/smoother/mld_c_as_smoother_csetc.f90
index 266ce52e..1c3446d5 100644
--- a/mlprec/impl/smoother/mld_c_as_smoother_csetc.f90
+++ b/mlprec/impl/smoother/mld_c_as_smoother_csetc.f90
@@ -69,11 +69,7 @@ subroutine mld_c_as_smoother_csetc(sm,what,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
 end subroutine mld_c_as_smoother_csetc
diff --git a/mlprec/impl/smoother/mld_c_as_smoother_cseti.f90 b/mlprec/impl/smoother/mld_c_as_smoother_cseti.f90
index 64ffc92e..bf29ef92 100644
--- a/mlprec/impl/smoother/mld_c_as_smoother_cseti.f90
+++ b/mlprec/impl/smoother/mld_c_as_smoother_cseti.f90
@@ -67,11 +67,7 @@ subroutine mld_c_as_smoother_cseti(sm,what,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
 end subroutine mld_c_as_smoother_cseti
diff --git a/mlprec/impl/smoother/mld_c_as_smoother_csetr.f90 b/mlprec/impl/smoother/mld_c_as_smoother_csetr.f90
index 2a0330bf..2a9f08ca 100644
--- a/mlprec/impl/smoother/mld_c_as_smoother_csetr.f90
+++ b/mlprec/impl/smoother/mld_c_as_smoother_csetr.f90
@@ -63,11 +63,7 @@ subroutine mld_c_as_smoother_csetr(sm,what,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
 end subroutine mld_c_as_smoother_csetr
diff --git a/mlprec/impl/smoother/mld_c_as_smoother_free.f90 b/mlprec/impl/smoother/mld_c_as_smoother_free.f90
index efced5a7..d1e01a31 100644
--- a/mlprec/impl/smoother/mld_c_as_smoother_free.f90
+++ b/mlprec/impl/smoother/mld_c_as_smoother_free.f90
@@ -66,11 +66,7 @@ subroutine mld_c_as_smoother_free(sm,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 mld_c_as_smoother_free
diff --git a/mlprec/impl/smoother/mld_c_as_smoother_setc.f90 b/mlprec/impl/smoother/mld_c_as_smoother_setc.f90
index 6a2e5d94..a7cc2cb8 100644
--- a/mlprec/impl/smoother/mld_c_as_smoother_setc.f90
+++ b/mlprec/impl/smoother/mld_c_as_smoother_setc.f90
@@ -69,11 +69,7 @@ subroutine mld_c_as_smoother_setc(sm,what,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
 end subroutine mld_c_as_smoother_setc
diff --git a/mlprec/impl/smoother/mld_c_as_smoother_seti.f90 b/mlprec/impl/smoother/mld_c_as_smoother_seti.f90
index b7ca7c56..2defa7f5 100644
--- a/mlprec/impl/smoother/mld_c_as_smoother_seti.f90
+++ b/mlprec/impl/smoother/mld_c_as_smoother_seti.f90
@@ -67,11 +67,7 @@ subroutine mld_c_as_smoother_seti(sm,what,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
 end subroutine mld_c_as_smoother_seti
diff --git a/mlprec/impl/smoother/mld_c_as_smoother_setr.f90 b/mlprec/impl/smoother/mld_c_as_smoother_setr.f90
index 0608305c..8989c208 100644
--- a/mlprec/impl/smoother/mld_c_as_smoother_setr.f90
+++ b/mlprec/impl/smoother/mld_c_as_smoother_setr.f90
@@ -63,11 +63,7 @@ subroutine mld_c_as_smoother_setr(sm,what,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
 end subroutine mld_c_as_smoother_setr
diff --git a/mlprec/impl/smoother/mld_c_base_smoother_apply.f90 b/mlprec/impl/smoother/mld_c_base_smoother_apply.f90
index fabfa841..2d07a3e5 100644
--- a/mlprec/impl/smoother/mld_c_base_smoother_apply.f90
+++ b/mlprec/impl/smoother/mld_c_base_smoother_apply.f90
@@ -69,12 +69,8 @@ subroutine mld_c_base_smoother_apply(alpha,sm,x,beta,y,desc_data,trans,sweeps,wo
   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 mld_c_base_smoother_apply
diff --git a/mlprec/impl/smoother/mld_c_base_smoother_apply_vect.f90 b/mlprec/impl/smoother/mld_c_base_smoother_apply_vect.f90
index 114ebbbd..cb7a3e7a 100644
--- a/mlprec/impl/smoother/mld_c_base_smoother_apply_vect.f90
+++ b/mlprec/impl/smoother/mld_c_base_smoother_apply_vect.f90
@@ -70,12 +70,8 @@ subroutine mld_c_base_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,&
   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 mld_c_base_smoother_apply_vect
diff --git a/mlprec/impl/smoother/mld_c_base_smoother_bld.f90 b/mlprec/impl/smoother/mld_c_base_smoother_bld.f90
index ef172c2b..dfc811a5 100644
--- a/mlprec/impl/smoother/mld_c_base_smoother_bld.f90
+++ b/mlprec/impl/smoother/mld_c_base_smoother_bld.f90
@@ -68,11 +68,7 @@ subroutine mld_c_base_smoother_bld(a,desc_a,sm,upd,info,amold,vmold,imold)
   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 mld_c_base_smoother_bld
diff --git a/mlprec/impl/smoother/mld_c_base_smoother_check.f90 b/mlprec/impl/smoother/mld_c_base_smoother_check.f90
index da9cec34..ed8fc246 100644
--- a/mlprec/impl/smoother/mld_c_base_smoother_check.f90
+++ b/mlprec/impl/smoother/mld_c_base_smoother_check.f90
@@ -64,11 +64,7 @@ subroutine mld_c_base_smoother_check(sm,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 mld_c_base_smoother_check
diff --git a/mlprec/impl/smoother/mld_c_base_smoother_clone.f90 b/mlprec/impl/smoother/mld_c_base_smoother_clone.f90
index d89ad752..e936cb9c 100644
--- a/mlprec/impl/smoother/mld_c_base_smoother_clone.f90
+++ b/mlprec/impl/smoother/mld_c_base_smoother_clone.f90
@@ -57,11 +57,7 @@ subroutine mld_c_base_smoother_clone(sm,smout,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 mld_c_base_smoother_clone
diff --git a/mlprec/impl/smoother/mld_c_base_smoother_cnv.f90 b/mlprec/impl/smoother/mld_c_base_smoother_cnv.f90
index 5669803c..101b364b 100644
--- a/mlprec/impl/smoother/mld_c_base_smoother_cnv.f90
+++ b/mlprec/impl/smoother/mld_c_base_smoother_cnv.f90
@@ -65,11 +65,7 @@ subroutine mld_c_base_smoother_cnv(sm,info,amold,vmold,imold)
   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 mld_c_base_smoother_cnv
diff --git a/mlprec/impl/smoother/mld_c_base_smoother_csetc.f90 b/mlprec/impl/smoother/mld_c_base_smoother_csetc.f90
index fa03df64..07248fe6 100644
--- a/mlprec/impl/smoother/mld_c_base_smoother_csetc.f90
+++ b/mlprec/impl/smoother/mld_c_base_smoother_csetc.f90
@@ -68,11 +68,7 @@ subroutine mld_c_base_smoother_csetc(sm,what,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
 end subroutine mld_c_base_smoother_csetc
diff --git a/mlprec/impl/smoother/mld_c_base_smoother_cseti.f90 b/mlprec/impl/smoother/mld_c_base_smoother_cseti.f90
index cc5f48fb..f0398abc 100644
--- a/mlprec/impl/smoother/mld_c_base_smoother_cseti.f90
+++ b/mlprec/impl/smoother/mld_c_base_smoother_cseti.f90
@@ -59,11 +59,7 @@ subroutine mld_c_base_smoother_cseti(sm,what,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
 end subroutine mld_c_base_smoother_cseti
diff --git a/mlprec/impl/smoother/mld_c_base_smoother_csetr.f90 b/mlprec/impl/smoother/mld_c_base_smoother_csetr.f90
index ccd6c8e9..afab50ec 100644
--- a/mlprec/impl/smoother/mld_c_base_smoother_csetr.f90
+++ b/mlprec/impl/smoother/mld_c_base_smoother_csetr.f90
@@ -63,11 +63,7 @@ subroutine mld_c_base_smoother_csetr(sm,what,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
 end subroutine mld_c_base_smoother_csetr
diff --git a/mlprec/impl/smoother/mld_c_base_smoother_descr.f90 b/mlprec/impl/smoother/mld_c_base_smoother_descr.f90
index 9005921b..07c1b330 100644
--- a/mlprec/impl/smoother/mld_c_base_smoother_descr.f90
+++ b/mlprec/impl/smoother/mld_c_base_smoother_descr.f90
@@ -83,11 +83,7 @@ subroutine mld_c_base_smoother_descr(sm,info,iout,coarse)
   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 mld_c_base_smoother_descr
diff --git a/mlprec/impl/smoother/mld_c_base_smoother_free.f90 b/mlprec/impl/smoother/mld_c_base_smoother_free.f90
index c52ea4a4..a46a7850 100644
--- a/mlprec/impl/smoother/mld_c_base_smoother_free.f90
+++ b/mlprec/impl/smoother/mld_c_base_smoother_free.f90
@@ -63,11 +63,7 @@ subroutine mld_c_base_smoother_free(sm,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 mld_c_base_smoother_free
diff --git a/mlprec/impl/smoother/mld_c_base_smoother_setc.f90 b/mlprec/impl/smoother/mld_c_base_smoother_setc.f90
index deea4156..c5a48dbc 100644
--- a/mlprec/impl/smoother/mld_c_base_smoother_setc.f90
+++ b/mlprec/impl/smoother/mld_c_base_smoother_setc.f90
@@ -68,11 +68,7 @@ subroutine mld_c_base_smoother_setc(sm,what,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
 end subroutine mld_c_base_smoother_setc
diff --git a/mlprec/impl/smoother/mld_c_base_smoother_seti.f90 b/mlprec/impl/smoother/mld_c_base_smoother_seti.f90
index 94123604..7c808e18 100644
--- a/mlprec/impl/smoother/mld_c_base_smoother_seti.f90
+++ b/mlprec/impl/smoother/mld_c_base_smoother_seti.f90
@@ -59,11 +59,7 @@ subroutine mld_c_base_smoother_seti(sm,what,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
 end subroutine mld_c_base_smoother_seti
diff --git a/mlprec/impl/smoother/mld_c_base_smoother_setr.f90 b/mlprec/impl/smoother/mld_c_base_smoother_setr.f90
index bc5b275e..e033c593 100644
--- a/mlprec/impl/smoother/mld_c_base_smoother_setr.f90
+++ b/mlprec/impl/smoother/mld_c_base_smoother_setr.f90
@@ -63,11 +63,7 @@ subroutine mld_c_base_smoother_setr(sm,what,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
 end subroutine mld_c_base_smoother_setr
diff --git a/mlprec/impl/smoother/mld_c_jac_smoother_apply.f90 b/mlprec/impl/smoother/mld_c_jac_smoother_apply.f90
index c17a3c4d..42f13c2b 100644
--- a/mlprec/impl/smoother/mld_c_jac_smoother_apply.f90
+++ b/mlprec/impl/smoother/mld_c_jac_smoother_apply.f90
@@ -189,12 +189,8 @@ subroutine mld_c_jac_smoother_apply(alpha,sm,x,beta,y,desc_data,trans,sweeps,wor
   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 mld_c_jac_smoother_apply
diff --git a/mlprec/impl/smoother/mld_c_jac_smoother_apply_vect.f90 b/mlprec/impl/smoother/mld_c_jac_smoother_apply_vect.f90
index fd160970..0a6719b5 100644
--- a/mlprec/impl/smoother/mld_c_jac_smoother_apply_vect.f90
+++ b/mlprec/impl/smoother/mld_c_jac_smoother_apply_vect.f90
@@ -185,12 +185,8 @@ subroutine mld_c_jac_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,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
 
 end subroutine mld_c_jac_smoother_apply_vect
diff --git a/mlprec/impl/smoother/mld_c_jac_smoother_bld.f90 b/mlprec/impl/smoother/mld_c_jac_smoother_bld.f90
index 16bbf371..edd11326 100644
--- a/mlprec/impl/smoother/mld_c_jac_smoother_bld.f90
+++ b/mlprec/impl/smoother/mld_c_jac_smoother_bld.f90
@@ -109,12 +109,8 @@ subroutine mld_c_jac_smoother_bld(a,desc_a,sm,upd,info,amold,vmold,imold)
   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 mld_c_jac_smoother_bld
diff --git a/mlprec/impl/smoother/mld_c_jac_smoother_clone.f90 b/mlprec/impl/smoother/mld_c_jac_smoother_clone.f90
index c4950a31..b0e4689e 100644
--- a/mlprec/impl/smoother/mld_c_jac_smoother_clone.f90
+++ b/mlprec/impl/smoother/mld_c_jac_smoother_clone.f90
@@ -83,11 +83,7 @@ subroutine mld_c_jac_smoother_clone(sm,smout,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 mld_c_jac_smoother_clone
diff --git a/mlprec/impl/smoother/mld_c_jac_smoother_cnv.f90 b/mlprec/impl/smoother/mld_c_jac_smoother_cnv.f90
index 75c266e6..1d003ddd 100644
--- a/mlprec/impl/smoother/mld_c_jac_smoother_cnv.f90
+++ b/mlprec/impl/smoother/mld_c_jac_smoother_cnv.f90
@@ -80,12 +80,8 @@ subroutine mld_c_jac_smoother_cnv(sm,info,amold,vmold,imold)
   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 mld_c_jac_smoother_cnv
diff --git a/mlprec/impl/smoother/mld_d_as_smoother_apply.f90 b/mlprec/impl/smoother/mld_d_as_smoother_apply.f90
index 2f1830a9..ee7f7e19 100644
--- a/mlprec/impl/smoother/mld_d_as_smoother_apply.f90
+++ b/mlprec/impl/smoother/mld_d_as_smoother_apply.f90
@@ -476,12 +476,8 @@ subroutine mld_d_as_smoother_apply(alpha,sm,x,beta,y,desc_data,trans,sweeps,work
   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 mld_d_as_smoother_apply
diff --git a/mlprec/impl/smoother/mld_d_as_smoother_apply_vect.f90 b/mlprec/impl/smoother/mld_d_as_smoother_apply_vect.f90
index e174d08c..26daa63b 100644
--- a/mlprec/impl/smoother/mld_d_as_smoother_apply_vect.f90
+++ b/mlprec/impl/smoother/mld_d_as_smoother_apply_vect.f90
@@ -495,12 +495,8 @@ subroutine mld_d_as_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,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
 
 end subroutine mld_d_as_smoother_apply_vect
diff --git a/mlprec/impl/smoother/mld_d_as_smoother_bld.f90 b/mlprec/impl/smoother/mld_d_as_smoother_bld.f90
index 9e848d3a..6990ebd0 100644
--- a/mlprec/impl/smoother/mld_d_as_smoother_bld.f90
+++ b/mlprec/impl/smoother/mld_d_as_smoother_bld.f90
@@ -185,11 +185,7 @@ subroutine mld_d_as_smoother_bld(a,desc_a,sm,upd,info,amold,vmold,imold)
   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 mld_d_as_smoother_bld
diff --git a/mlprec/impl/smoother/mld_d_as_smoother_check.f90 b/mlprec/impl/smoother/mld_d_as_smoother_check.f90
index edf65d22..ee1d9715 100644
--- a/mlprec/impl/smoother/mld_d_as_smoother_check.f90
+++ b/mlprec/impl/smoother/mld_d_as_smoother_check.f90
@@ -73,11 +73,7 @@ subroutine mld_d_as_smoother_check(sm,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 mld_d_as_smoother_check
diff --git a/mlprec/impl/smoother/mld_d_as_smoother_clone.f90 b/mlprec/impl/smoother/mld_d_as_smoother_clone.f90
index c46281c0..dec3b4e3 100644
--- a/mlprec/impl/smoother/mld_d_as_smoother_clone.f90
+++ b/mlprec/impl/smoother/mld_d_as_smoother_clone.f90
@@ -88,11 +88,7 @@ subroutine mld_d_as_smoother_clone(sm,smout,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 mld_d_as_smoother_clone
diff --git a/mlprec/impl/smoother/mld_d_as_smoother_cnv.f90 b/mlprec/impl/smoother/mld_d_as_smoother_cnv.f90
index 5d872dce..fb3e9df1 100644
--- a/mlprec/impl/smoother/mld_d_as_smoother_cnv.f90
+++ b/mlprec/impl/smoother/mld_d_as_smoother_cnv.f90
@@ -91,11 +91,7 @@ subroutine mld_d_as_smoother_cnv(sm,info,amold,vmold,imold)
   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 mld_d_as_smoother_cnv
diff --git a/mlprec/impl/smoother/mld_d_as_smoother_csetc.f90 b/mlprec/impl/smoother/mld_d_as_smoother_csetc.f90
index 50e508b8..c7bb8ca7 100644
--- a/mlprec/impl/smoother/mld_d_as_smoother_csetc.f90
+++ b/mlprec/impl/smoother/mld_d_as_smoother_csetc.f90
@@ -69,11 +69,7 @@ subroutine mld_d_as_smoother_csetc(sm,what,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
 end subroutine mld_d_as_smoother_csetc
diff --git a/mlprec/impl/smoother/mld_d_as_smoother_cseti.f90 b/mlprec/impl/smoother/mld_d_as_smoother_cseti.f90
index 34ac1760..3ff0f305 100644
--- a/mlprec/impl/smoother/mld_d_as_smoother_cseti.f90
+++ b/mlprec/impl/smoother/mld_d_as_smoother_cseti.f90
@@ -67,11 +67,7 @@ subroutine mld_d_as_smoother_cseti(sm,what,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
 end subroutine mld_d_as_smoother_cseti
diff --git a/mlprec/impl/smoother/mld_d_as_smoother_csetr.f90 b/mlprec/impl/smoother/mld_d_as_smoother_csetr.f90
index 33f86545..3fe50fcc 100644
--- a/mlprec/impl/smoother/mld_d_as_smoother_csetr.f90
+++ b/mlprec/impl/smoother/mld_d_as_smoother_csetr.f90
@@ -63,11 +63,7 @@ subroutine mld_d_as_smoother_csetr(sm,what,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
 end subroutine mld_d_as_smoother_csetr
diff --git a/mlprec/impl/smoother/mld_d_as_smoother_free.f90 b/mlprec/impl/smoother/mld_d_as_smoother_free.f90
index 36bb1c7a..10c6f78f 100644
--- a/mlprec/impl/smoother/mld_d_as_smoother_free.f90
+++ b/mlprec/impl/smoother/mld_d_as_smoother_free.f90
@@ -66,11 +66,7 @@ subroutine mld_d_as_smoother_free(sm,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 mld_d_as_smoother_free
diff --git a/mlprec/impl/smoother/mld_d_as_smoother_setc.f90 b/mlprec/impl/smoother/mld_d_as_smoother_setc.f90
index 5f08271b..bdd4823b 100644
--- a/mlprec/impl/smoother/mld_d_as_smoother_setc.f90
+++ b/mlprec/impl/smoother/mld_d_as_smoother_setc.f90
@@ -69,11 +69,7 @@ subroutine mld_d_as_smoother_setc(sm,what,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
 end subroutine mld_d_as_smoother_setc
diff --git a/mlprec/impl/smoother/mld_d_as_smoother_seti.f90 b/mlprec/impl/smoother/mld_d_as_smoother_seti.f90
index 19ac831f..6f3c42e9 100644
--- a/mlprec/impl/smoother/mld_d_as_smoother_seti.f90
+++ b/mlprec/impl/smoother/mld_d_as_smoother_seti.f90
@@ -67,11 +67,7 @@ subroutine mld_d_as_smoother_seti(sm,what,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
 end subroutine mld_d_as_smoother_seti
diff --git a/mlprec/impl/smoother/mld_d_as_smoother_setr.f90 b/mlprec/impl/smoother/mld_d_as_smoother_setr.f90
index 026dd18d..a91601e2 100644
--- a/mlprec/impl/smoother/mld_d_as_smoother_setr.f90
+++ b/mlprec/impl/smoother/mld_d_as_smoother_setr.f90
@@ -63,11 +63,7 @@ subroutine mld_d_as_smoother_setr(sm,what,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
 end subroutine mld_d_as_smoother_setr
diff --git a/mlprec/impl/smoother/mld_d_base_smoother_apply.f90 b/mlprec/impl/smoother/mld_d_base_smoother_apply.f90
index d821e11a..7ca8753d 100644
--- a/mlprec/impl/smoother/mld_d_base_smoother_apply.f90
+++ b/mlprec/impl/smoother/mld_d_base_smoother_apply.f90
@@ -69,12 +69,8 @@ subroutine mld_d_base_smoother_apply(alpha,sm,x,beta,y,desc_data,trans,sweeps,wo
   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 mld_d_base_smoother_apply
diff --git a/mlprec/impl/smoother/mld_d_base_smoother_apply_vect.f90 b/mlprec/impl/smoother/mld_d_base_smoother_apply_vect.f90
index 03d27949..23b2edd0 100644
--- a/mlprec/impl/smoother/mld_d_base_smoother_apply_vect.f90
+++ b/mlprec/impl/smoother/mld_d_base_smoother_apply_vect.f90
@@ -70,12 +70,8 @@ subroutine mld_d_base_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,&
   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 mld_d_base_smoother_apply_vect
diff --git a/mlprec/impl/smoother/mld_d_base_smoother_bld.f90 b/mlprec/impl/smoother/mld_d_base_smoother_bld.f90
index cfb0642c..385a0fb5 100644
--- a/mlprec/impl/smoother/mld_d_base_smoother_bld.f90
+++ b/mlprec/impl/smoother/mld_d_base_smoother_bld.f90
@@ -68,11 +68,7 @@ subroutine mld_d_base_smoother_bld(a,desc_a,sm,upd,info,amold,vmold,imold)
   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 mld_d_base_smoother_bld
diff --git a/mlprec/impl/smoother/mld_d_base_smoother_check.f90 b/mlprec/impl/smoother/mld_d_base_smoother_check.f90
index 41fb0d4a..69230971 100644
--- a/mlprec/impl/smoother/mld_d_base_smoother_check.f90
+++ b/mlprec/impl/smoother/mld_d_base_smoother_check.f90
@@ -64,11 +64,7 @@ subroutine mld_d_base_smoother_check(sm,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 mld_d_base_smoother_check
diff --git a/mlprec/impl/smoother/mld_d_base_smoother_clone.f90 b/mlprec/impl/smoother/mld_d_base_smoother_clone.f90
index 39d8391b..9fe45f33 100644
--- a/mlprec/impl/smoother/mld_d_base_smoother_clone.f90
+++ b/mlprec/impl/smoother/mld_d_base_smoother_clone.f90
@@ -57,11 +57,7 @@ subroutine mld_d_base_smoother_clone(sm,smout,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 mld_d_base_smoother_clone
diff --git a/mlprec/impl/smoother/mld_d_base_smoother_cnv.f90 b/mlprec/impl/smoother/mld_d_base_smoother_cnv.f90
index 3822f40a..d1e179c2 100644
--- a/mlprec/impl/smoother/mld_d_base_smoother_cnv.f90
+++ b/mlprec/impl/smoother/mld_d_base_smoother_cnv.f90
@@ -65,11 +65,7 @@ subroutine mld_d_base_smoother_cnv(sm,info,amold,vmold,imold)
   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 mld_d_base_smoother_cnv
diff --git a/mlprec/impl/smoother/mld_d_base_smoother_csetc.f90 b/mlprec/impl/smoother/mld_d_base_smoother_csetc.f90
index 59eece0c..f5aff92b 100644
--- a/mlprec/impl/smoother/mld_d_base_smoother_csetc.f90
+++ b/mlprec/impl/smoother/mld_d_base_smoother_csetc.f90
@@ -68,11 +68,7 @@ subroutine mld_d_base_smoother_csetc(sm,what,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
 end subroutine mld_d_base_smoother_csetc
diff --git a/mlprec/impl/smoother/mld_d_base_smoother_cseti.f90 b/mlprec/impl/smoother/mld_d_base_smoother_cseti.f90
index 1c1b5cbc..5d80d03c 100644
--- a/mlprec/impl/smoother/mld_d_base_smoother_cseti.f90
+++ b/mlprec/impl/smoother/mld_d_base_smoother_cseti.f90
@@ -59,11 +59,7 @@ subroutine mld_d_base_smoother_cseti(sm,what,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
 end subroutine mld_d_base_smoother_cseti
diff --git a/mlprec/impl/smoother/mld_d_base_smoother_csetr.f90 b/mlprec/impl/smoother/mld_d_base_smoother_csetr.f90
index a19a3b73..be77bf4b 100644
--- a/mlprec/impl/smoother/mld_d_base_smoother_csetr.f90
+++ b/mlprec/impl/smoother/mld_d_base_smoother_csetr.f90
@@ -63,11 +63,7 @@ subroutine mld_d_base_smoother_csetr(sm,what,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
 end subroutine mld_d_base_smoother_csetr
diff --git a/mlprec/impl/smoother/mld_d_base_smoother_descr.f90 b/mlprec/impl/smoother/mld_d_base_smoother_descr.f90
index 405aed17..1a96bb0b 100644
--- a/mlprec/impl/smoother/mld_d_base_smoother_descr.f90
+++ b/mlprec/impl/smoother/mld_d_base_smoother_descr.f90
@@ -83,11 +83,7 @@ subroutine mld_d_base_smoother_descr(sm,info,iout,coarse)
   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 mld_d_base_smoother_descr
diff --git a/mlprec/impl/smoother/mld_d_base_smoother_free.f90 b/mlprec/impl/smoother/mld_d_base_smoother_free.f90
index 6f38afb7..8e8e46f2 100644
--- a/mlprec/impl/smoother/mld_d_base_smoother_free.f90
+++ b/mlprec/impl/smoother/mld_d_base_smoother_free.f90
@@ -63,11 +63,7 @@ subroutine mld_d_base_smoother_free(sm,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 mld_d_base_smoother_free
diff --git a/mlprec/impl/smoother/mld_d_base_smoother_setc.f90 b/mlprec/impl/smoother/mld_d_base_smoother_setc.f90
index c8fd2c89..a3ee63a6 100644
--- a/mlprec/impl/smoother/mld_d_base_smoother_setc.f90
+++ b/mlprec/impl/smoother/mld_d_base_smoother_setc.f90
@@ -68,11 +68,7 @@ subroutine mld_d_base_smoother_setc(sm,what,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
 end subroutine mld_d_base_smoother_setc
diff --git a/mlprec/impl/smoother/mld_d_base_smoother_seti.f90 b/mlprec/impl/smoother/mld_d_base_smoother_seti.f90
index 4ee96afe..8385e0a2 100644
--- a/mlprec/impl/smoother/mld_d_base_smoother_seti.f90
+++ b/mlprec/impl/smoother/mld_d_base_smoother_seti.f90
@@ -59,11 +59,7 @@ subroutine mld_d_base_smoother_seti(sm,what,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
 end subroutine mld_d_base_smoother_seti
diff --git a/mlprec/impl/smoother/mld_d_base_smoother_setr.f90 b/mlprec/impl/smoother/mld_d_base_smoother_setr.f90
index 13b06de8..b064ef27 100644
--- a/mlprec/impl/smoother/mld_d_base_smoother_setr.f90
+++ b/mlprec/impl/smoother/mld_d_base_smoother_setr.f90
@@ -63,11 +63,7 @@ subroutine mld_d_base_smoother_setr(sm,what,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
 end subroutine mld_d_base_smoother_setr
diff --git a/mlprec/impl/smoother/mld_d_jac_smoother_apply.f90 b/mlprec/impl/smoother/mld_d_jac_smoother_apply.f90
index 1ed15e12..c7284e92 100644
--- a/mlprec/impl/smoother/mld_d_jac_smoother_apply.f90
+++ b/mlprec/impl/smoother/mld_d_jac_smoother_apply.f90
@@ -189,12 +189,8 @@ subroutine mld_d_jac_smoother_apply(alpha,sm,x,beta,y,desc_data,trans,sweeps,wor
   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 mld_d_jac_smoother_apply
diff --git a/mlprec/impl/smoother/mld_d_jac_smoother_apply_vect.f90 b/mlprec/impl/smoother/mld_d_jac_smoother_apply_vect.f90
index 4f13a78f..a8c94032 100644
--- a/mlprec/impl/smoother/mld_d_jac_smoother_apply_vect.f90
+++ b/mlprec/impl/smoother/mld_d_jac_smoother_apply_vect.f90
@@ -185,12 +185,8 @@ subroutine mld_d_jac_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,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
 
 end subroutine mld_d_jac_smoother_apply_vect
diff --git a/mlprec/impl/smoother/mld_d_jac_smoother_bld.f90 b/mlprec/impl/smoother/mld_d_jac_smoother_bld.f90
index 587db844..8db77cda 100644
--- a/mlprec/impl/smoother/mld_d_jac_smoother_bld.f90
+++ b/mlprec/impl/smoother/mld_d_jac_smoother_bld.f90
@@ -109,12 +109,8 @@ subroutine mld_d_jac_smoother_bld(a,desc_a,sm,upd,info,amold,vmold,imold)
   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 mld_d_jac_smoother_bld
diff --git a/mlprec/impl/smoother/mld_d_jac_smoother_clone.f90 b/mlprec/impl/smoother/mld_d_jac_smoother_clone.f90
index fa88ac9a..36fcdb06 100644
--- a/mlprec/impl/smoother/mld_d_jac_smoother_clone.f90
+++ b/mlprec/impl/smoother/mld_d_jac_smoother_clone.f90
@@ -83,11 +83,7 @@ subroutine mld_d_jac_smoother_clone(sm,smout,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 mld_d_jac_smoother_clone
diff --git a/mlprec/impl/smoother/mld_d_jac_smoother_cnv.f90 b/mlprec/impl/smoother/mld_d_jac_smoother_cnv.f90
index 5fccdd13..7cd30134 100644
--- a/mlprec/impl/smoother/mld_d_jac_smoother_cnv.f90
+++ b/mlprec/impl/smoother/mld_d_jac_smoother_cnv.f90
@@ -80,12 +80,8 @@ subroutine mld_d_jac_smoother_cnv(sm,info,amold,vmold,imold)
   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 mld_d_jac_smoother_cnv
diff --git a/mlprec/impl/smoother/mld_s_as_smoother_apply.f90 b/mlprec/impl/smoother/mld_s_as_smoother_apply.f90
index 67987669..7e93de0b 100644
--- a/mlprec/impl/smoother/mld_s_as_smoother_apply.f90
+++ b/mlprec/impl/smoother/mld_s_as_smoother_apply.f90
@@ -476,12 +476,8 @@ subroutine mld_s_as_smoother_apply(alpha,sm,x,beta,y,desc_data,trans,sweeps,work
   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 mld_s_as_smoother_apply
diff --git a/mlprec/impl/smoother/mld_s_as_smoother_apply_vect.f90 b/mlprec/impl/smoother/mld_s_as_smoother_apply_vect.f90
index b9935efc..c0722a57 100644
--- a/mlprec/impl/smoother/mld_s_as_smoother_apply_vect.f90
+++ b/mlprec/impl/smoother/mld_s_as_smoother_apply_vect.f90
@@ -495,12 +495,8 @@ subroutine mld_s_as_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,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
 
 end subroutine mld_s_as_smoother_apply_vect
diff --git a/mlprec/impl/smoother/mld_s_as_smoother_bld.f90 b/mlprec/impl/smoother/mld_s_as_smoother_bld.f90
index 3ed6ea3a..ab935c8c 100644
--- a/mlprec/impl/smoother/mld_s_as_smoother_bld.f90
+++ b/mlprec/impl/smoother/mld_s_as_smoother_bld.f90
@@ -185,11 +185,7 @@ subroutine mld_s_as_smoother_bld(a,desc_a,sm,upd,info,amold,vmold,imold)
   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 mld_s_as_smoother_bld
diff --git a/mlprec/impl/smoother/mld_s_as_smoother_check.f90 b/mlprec/impl/smoother/mld_s_as_smoother_check.f90
index 590385b2..b8648cca 100644
--- a/mlprec/impl/smoother/mld_s_as_smoother_check.f90
+++ b/mlprec/impl/smoother/mld_s_as_smoother_check.f90
@@ -73,11 +73,7 @@ subroutine mld_s_as_smoother_check(sm,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 mld_s_as_smoother_check
diff --git a/mlprec/impl/smoother/mld_s_as_smoother_clone.f90 b/mlprec/impl/smoother/mld_s_as_smoother_clone.f90
index 6e11b5d5..3592be52 100644
--- a/mlprec/impl/smoother/mld_s_as_smoother_clone.f90
+++ b/mlprec/impl/smoother/mld_s_as_smoother_clone.f90
@@ -88,11 +88,7 @@ subroutine mld_s_as_smoother_clone(sm,smout,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 mld_s_as_smoother_clone
diff --git a/mlprec/impl/smoother/mld_s_as_smoother_cnv.f90 b/mlprec/impl/smoother/mld_s_as_smoother_cnv.f90
index bdec52d6..08facfeb 100644
--- a/mlprec/impl/smoother/mld_s_as_smoother_cnv.f90
+++ b/mlprec/impl/smoother/mld_s_as_smoother_cnv.f90
@@ -91,11 +91,7 @@ subroutine mld_s_as_smoother_cnv(sm,info,amold,vmold,imold)
   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 mld_s_as_smoother_cnv
diff --git a/mlprec/impl/smoother/mld_s_as_smoother_csetc.f90 b/mlprec/impl/smoother/mld_s_as_smoother_csetc.f90
index 45a92924..8ae65cef 100644
--- a/mlprec/impl/smoother/mld_s_as_smoother_csetc.f90
+++ b/mlprec/impl/smoother/mld_s_as_smoother_csetc.f90
@@ -69,11 +69,7 @@ subroutine mld_s_as_smoother_csetc(sm,what,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
 end subroutine mld_s_as_smoother_csetc
diff --git a/mlprec/impl/smoother/mld_s_as_smoother_cseti.f90 b/mlprec/impl/smoother/mld_s_as_smoother_cseti.f90
index 1fb99c12..73553fce 100644
--- a/mlprec/impl/smoother/mld_s_as_smoother_cseti.f90
+++ b/mlprec/impl/smoother/mld_s_as_smoother_cseti.f90
@@ -67,11 +67,7 @@ subroutine mld_s_as_smoother_cseti(sm,what,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
 end subroutine mld_s_as_smoother_cseti
diff --git a/mlprec/impl/smoother/mld_s_as_smoother_csetr.f90 b/mlprec/impl/smoother/mld_s_as_smoother_csetr.f90
index 789d0df0..8a3acebe 100644
--- a/mlprec/impl/smoother/mld_s_as_smoother_csetr.f90
+++ b/mlprec/impl/smoother/mld_s_as_smoother_csetr.f90
@@ -63,11 +63,7 @@ subroutine mld_s_as_smoother_csetr(sm,what,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
 end subroutine mld_s_as_smoother_csetr
diff --git a/mlprec/impl/smoother/mld_s_as_smoother_free.f90 b/mlprec/impl/smoother/mld_s_as_smoother_free.f90
index d9155298..28b40aec 100644
--- a/mlprec/impl/smoother/mld_s_as_smoother_free.f90
+++ b/mlprec/impl/smoother/mld_s_as_smoother_free.f90
@@ -66,11 +66,7 @@ subroutine mld_s_as_smoother_free(sm,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 mld_s_as_smoother_free
diff --git a/mlprec/impl/smoother/mld_s_as_smoother_setc.f90 b/mlprec/impl/smoother/mld_s_as_smoother_setc.f90
index 0272d3d3..ab80fac4 100644
--- a/mlprec/impl/smoother/mld_s_as_smoother_setc.f90
+++ b/mlprec/impl/smoother/mld_s_as_smoother_setc.f90
@@ -69,11 +69,7 @@ subroutine mld_s_as_smoother_setc(sm,what,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
 end subroutine mld_s_as_smoother_setc
diff --git a/mlprec/impl/smoother/mld_s_as_smoother_seti.f90 b/mlprec/impl/smoother/mld_s_as_smoother_seti.f90
index bbb10ec9..488cd248 100644
--- a/mlprec/impl/smoother/mld_s_as_smoother_seti.f90
+++ b/mlprec/impl/smoother/mld_s_as_smoother_seti.f90
@@ -67,11 +67,7 @@ subroutine mld_s_as_smoother_seti(sm,what,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
 end subroutine mld_s_as_smoother_seti
diff --git a/mlprec/impl/smoother/mld_s_as_smoother_setr.f90 b/mlprec/impl/smoother/mld_s_as_smoother_setr.f90
index f8c96707..ca4ba4ac 100644
--- a/mlprec/impl/smoother/mld_s_as_smoother_setr.f90
+++ b/mlprec/impl/smoother/mld_s_as_smoother_setr.f90
@@ -63,11 +63,7 @@ subroutine mld_s_as_smoother_setr(sm,what,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
 end subroutine mld_s_as_smoother_setr
diff --git a/mlprec/impl/smoother/mld_s_base_smoother_apply.f90 b/mlprec/impl/smoother/mld_s_base_smoother_apply.f90
index a43e0c6f..e3b4652b 100644
--- a/mlprec/impl/smoother/mld_s_base_smoother_apply.f90
+++ b/mlprec/impl/smoother/mld_s_base_smoother_apply.f90
@@ -69,12 +69,8 @@ subroutine mld_s_base_smoother_apply(alpha,sm,x,beta,y,desc_data,trans,sweeps,wo
   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 mld_s_base_smoother_apply
diff --git a/mlprec/impl/smoother/mld_s_base_smoother_apply_vect.f90 b/mlprec/impl/smoother/mld_s_base_smoother_apply_vect.f90
index 44eb9580..869f37b1 100644
--- a/mlprec/impl/smoother/mld_s_base_smoother_apply_vect.f90
+++ b/mlprec/impl/smoother/mld_s_base_smoother_apply_vect.f90
@@ -70,12 +70,8 @@ subroutine mld_s_base_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,&
   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 mld_s_base_smoother_apply_vect
diff --git a/mlprec/impl/smoother/mld_s_base_smoother_bld.f90 b/mlprec/impl/smoother/mld_s_base_smoother_bld.f90
index 65a55ece..1e375b82 100644
--- a/mlprec/impl/smoother/mld_s_base_smoother_bld.f90
+++ b/mlprec/impl/smoother/mld_s_base_smoother_bld.f90
@@ -68,11 +68,7 @@ subroutine mld_s_base_smoother_bld(a,desc_a,sm,upd,info,amold,vmold,imold)
   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 mld_s_base_smoother_bld
diff --git a/mlprec/impl/smoother/mld_s_base_smoother_check.f90 b/mlprec/impl/smoother/mld_s_base_smoother_check.f90
index 32b849dc..cc750380 100644
--- a/mlprec/impl/smoother/mld_s_base_smoother_check.f90
+++ b/mlprec/impl/smoother/mld_s_base_smoother_check.f90
@@ -64,11 +64,7 @@ subroutine mld_s_base_smoother_check(sm,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 mld_s_base_smoother_check
diff --git a/mlprec/impl/smoother/mld_s_base_smoother_clone.f90 b/mlprec/impl/smoother/mld_s_base_smoother_clone.f90
index ff773072..5e1ff337 100644
--- a/mlprec/impl/smoother/mld_s_base_smoother_clone.f90
+++ b/mlprec/impl/smoother/mld_s_base_smoother_clone.f90
@@ -57,11 +57,7 @@ subroutine mld_s_base_smoother_clone(sm,smout,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 mld_s_base_smoother_clone
diff --git a/mlprec/impl/smoother/mld_s_base_smoother_cnv.f90 b/mlprec/impl/smoother/mld_s_base_smoother_cnv.f90
index 779596d6..e46a47cd 100644
--- a/mlprec/impl/smoother/mld_s_base_smoother_cnv.f90
+++ b/mlprec/impl/smoother/mld_s_base_smoother_cnv.f90
@@ -65,11 +65,7 @@ subroutine mld_s_base_smoother_cnv(sm,info,amold,vmold,imold)
   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 mld_s_base_smoother_cnv
diff --git a/mlprec/impl/smoother/mld_s_base_smoother_csetc.f90 b/mlprec/impl/smoother/mld_s_base_smoother_csetc.f90
index a7f7cd8f..ec3436de 100644
--- a/mlprec/impl/smoother/mld_s_base_smoother_csetc.f90
+++ b/mlprec/impl/smoother/mld_s_base_smoother_csetc.f90
@@ -68,11 +68,7 @@ subroutine mld_s_base_smoother_csetc(sm,what,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
 end subroutine mld_s_base_smoother_csetc
diff --git a/mlprec/impl/smoother/mld_s_base_smoother_cseti.f90 b/mlprec/impl/smoother/mld_s_base_smoother_cseti.f90
index 4e54f1a3..46a6b16e 100644
--- a/mlprec/impl/smoother/mld_s_base_smoother_cseti.f90
+++ b/mlprec/impl/smoother/mld_s_base_smoother_cseti.f90
@@ -59,11 +59,7 @@ subroutine mld_s_base_smoother_cseti(sm,what,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
 end subroutine mld_s_base_smoother_cseti
diff --git a/mlprec/impl/smoother/mld_s_base_smoother_csetr.f90 b/mlprec/impl/smoother/mld_s_base_smoother_csetr.f90
index de1472a0..07f02e73 100644
--- a/mlprec/impl/smoother/mld_s_base_smoother_csetr.f90
+++ b/mlprec/impl/smoother/mld_s_base_smoother_csetr.f90
@@ -63,11 +63,7 @@ subroutine mld_s_base_smoother_csetr(sm,what,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
 end subroutine mld_s_base_smoother_csetr
diff --git a/mlprec/impl/smoother/mld_s_base_smoother_descr.f90 b/mlprec/impl/smoother/mld_s_base_smoother_descr.f90
index bfd29ffd..882bc283 100644
--- a/mlprec/impl/smoother/mld_s_base_smoother_descr.f90
+++ b/mlprec/impl/smoother/mld_s_base_smoother_descr.f90
@@ -83,11 +83,7 @@ subroutine mld_s_base_smoother_descr(sm,info,iout,coarse)
   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 mld_s_base_smoother_descr
diff --git a/mlprec/impl/smoother/mld_s_base_smoother_free.f90 b/mlprec/impl/smoother/mld_s_base_smoother_free.f90
index de06017f..9f19301e 100644
--- a/mlprec/impl/smoother/mld_s_base_smoother_free.f90
+++ b/mlprec/impl/smoother/mld_s_base_smoother_free.f90
@@ -63,11 +63,7 @@ subroutine mld_s_base_smoother_free(sm,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 mld_s_base_smoother_free
diff --git a/mlprec/impl/smoother/mld_s_base_smoother_setc.f90 b/mlprec/impl/smoother/mld_s_base_smoother_setc.f90
index ae8cbe29..206a5542 100644
--- a/mlprec/impl/smoother/mld_s_base_smoother_setc.f90
+++ b/mlprec/impl/smoother/mld_s_base_smoother_setc.f90
@@ -68,11 +68,7 @@ subroutine mld_s_base_smoother_setc(sm,what,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
 end subroutine mld_s_base_smoother_setc
diff --git a/mlprec/impl/smoother/mld_s_base_smoother_seti.f90 b/mlprec/impl/smoother/mld_s_base_smoother_seti.f90
index 9e2fb279..7aba9822 100644
--- a/mlprec/impl/smoother/mld_s_base_smoother_seti.f90
+++ b/mlprec/impl/smoother/mld_s_base_smoother_seti.f90
@@ -59,11 +59,7 @@ subroutine mld_s_base_smoother_seti(sm,what,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
 end subroutine mld_s_base_smoother_seti
diff --git a/mlprec/impl/smoother/mld_s_base_smoother_setr.f90 b/mlprec/impl/smoother/mld_s_base_smoother_setr.f90
index bd68226e..da970937 100644
--- a/mlprec/impl/smoother/mld_s_base_smoother_setr.f90
+++ b/mlprec/impl/smoother/mld_s_base_smoother_setr.f90
@@ -63,11 +63,7 @@ subroutine mld_s_base_smoother_setr(sm,what,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
 end subroutine mld_s_base_smoother_setr
diff --git a/mlprec/impl/smoother/mld_s_jac_smoother_apply.f90 b/mlprec/impl/smoother/mld_s_jac_smoother_apply.f90
index b9017c55..3ad2ff83 100644
--- a/mlprec/impl/smoother/mld_s_jac_smoother_apply.f90
+++ b/mlprec/impl/smoother/mld_s_jac_smoother_apply.f90
@@ -189,12 +189,8 @@ subroutine mld_s_jac_smoother_apply(alpha,sm,x,beta,y,desc_data,trans,sweeps,wor
   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 mld_s_jac_smoother_apply
diff --git a/mlprec/impl/smoother/mld_s_jac_smoother_apply_vect.f90 b/mlprec/impl/smoother/mld_s_jac_smoother_apply_vect.f90
index dc72deee..9523e30d 100644
--- a/mlprec/impl/smoother/mld_s_jac_smoother_apply_vect.f90
+++ b/mlprec/impl/smoother/mld_s_jac_smoother_apply_vect.f90
@@ -185,12 +185,8 @@ subroutine mld_s_jac_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,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
 
 end subroutine mld_s_jac_smoother_apply_vect
diff --git a/mlprec/impl/smoother/mld_s_jac_smoother_bld.f90 b/mlprec/impl/smoother/mld_s_jac_smoother_bld.f90
index b883fea3..ab27c1b0 100644
--- a/mlprec/impl/smoother/mld_s_jac_smoother_bld.f90
+++ b/mlprec/impl/smoother/mld_s_jac_smoother_bld.f90
@@ -109,12 +109,8 @@ subroutine mld_s_jac_smoother_bld(a,desc_a,sm,upd,info,amold,vmold,imold)
   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 mld_s_jac_smoother_bld
diff --git a/mlprec/impl/smoother/mld_s_jac_smoother_clone.f90 b/mlprec/impl/smoother/mld_s_jac_smoother_clone.f90
index b56d6513..fefa0aac 100644
--- a/mlprec/impl/smoother/mld_s_jac_smoother_clone.f90
+++ b/mlprec/impl/smoother/mld_s_jac_smoother_clone.f90
@@ -83,11 +83,7 @@ subroutine mld_s_jac_smoother_clone(sm,smout,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 mld_s_jac_smoother_clone
diff --git a/mlprec/impl/smoother/mld_s_jac_smoother_cnv.f90 b/mlprec/impl/smoother/mld_s_jac_smoother_cnv.f90
index 009f901e..15e2e225 100644
--- a/mlprec/impl/smoother/mld_s_jac_smoother_cnv.f90
+++ b/mlprec/impl/smoother/mld_s_jac_smoother_cnv.f90
@@ -80,12 +80,8 @@ subroutine mld_s_jac_smoother_cnv(sm,info,amold,vmold,imold)
   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 mld_s_jac_smoother_cnv
diff --git a/mlprec/impl/smoother/mld_z_as_smoother_apply.f90 b/mlprec/impl/smoother/mld_z_as_smoother_apply.f90
index 4231d08a..2b7a21da 100644
--- a/mlprec/impl/smoother/mld_z_as_smoother_apply.f90
+++ b/mlprec/impl/smoother/mld_z_as_smoother_apply.f90
@@ -476,12 +476,8 @@ subroutine mld_z_as_smoother_apply(alpha,sm,x,beta,y,desc_data,trans,sweeps,work
   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 mld_z_as_smoother_apply
diff --git a/mlprec/impl/smoother/mld_z_as_smoother_apply_vect.f90 b/mlprec/impl/smoother/mld_z_as_smoother_apply_vect.f90
index 4c02f707..b142bdf5 100644
--- a/mlprec/impl/smoother/mld_z_as_smoother_apply_vect.f90
+++ b/mlprec/impl/smoother/mld_z_as_smoother_apply_vect.f90
@@ -495,12 +495,8 @@ subroutine mld_z_as_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,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
 
 end subroutine mld_z_as_smoother_apply_vect
diff --git a/mlprec/impl/smoother/mld_z_as_smoother_bld.f90 b/mlprec/impl/smoother/mld_z_as_smoother_bld.f90
index e7a26e68..fbf0f9dd 100644
--- a/mlprec/impl/smoother/mld_z_as_smoother_bld.f90
+++ b/mlprec/impl/smoother/mld_z_as_smoother_bld.f90
@@ -185,11 +185,7 @@ subroutine mld_z_as_smoother_bld(a,desc_a,sm,upd,info,amold,vmold,imold)
   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 mld_z_as_smoother_bld
diff --git a/mlprec/impl/smoother/mld_z_as_smoother_check.f90 b/mlprec/impl/smoother/mld_z_as_smoother_check.f90
index 88b4a2be..501b08ef 100644
--- a/mlprec/impl/smoother/mld_z_as_smoother_check.f90
+++ b/mlprec/impl/smoother/mld_z_as_smoother_check.f90
@@ -73,11 +73,7 @@ subroutine mld_z_as_smoother_check(sm,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 mld_z_as_smoother_check
diff --git a/mlprec/impl/smoother/mld_z_as_smoother_clone.f90 b/mlprec/impl/smoother/mld_z_as_smoother_clone.f90
index 2d970b96..1b8a40ec 100644
--- a/mlprec/impl/smoother/mld_z_as_smoother_clone.f90
+++ b/mlprec/impl/smoother/mld_z_as_smoother_clone.f90
@@ -88,11 +88,7 @@ subroutine mld_z_as_smoother_clone(sm,smout,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 mld_z_as_smoother_clone
diff --git a/mlprec/impl/smoother/mld_z_as_smoother_cnv.f90 b/mlprec/impl/smoother/mld_z_as_smoother_cnv.f90
index f0e4c5ab..37930d26 100644
--- a/mlprec/impl/smoother/mld_z_as_smoother_cnv.f90
+++ b/mlprec/impl/smoother/mld_z_as_smoother_cnv.f90
@@ -91,11 +91,7 @@ subroutine mld_z_as_smoother_cnv(sm,info,amold,vmold,imold)
   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 mld_z_as_smoother_cnv
diff --git a/mlprec/impl/smoother/mld_z_as_smoother_csetc.f90 b/mlprec/impl/smoother/mld_z_as_smoother_csetc.f90
index 4123dba6..1b6ebf2c 100644
--- a/mlprec/impl/smoother/mld_z_as_smoother_csetc.f90
+++ b/mlprec/impl/smoother/mld_z_as_smoother_csetc.f90
@@ -69,11 +69,7 @@ subroutine mld_z_as_smoother_csetc(sm,what,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
 end subroutine mld_z_as_smoother_csetc
diff --git a/mlprec/impl/smoother/mld_z_as_smoother_cseti.f90 b/mlprec/impl/smoother/mld_z_as_smoother_cseti.f90
index ae99ad08..76b687a6 100644
--- a/mlprec/impl/smoother/mld_z_as_smoother_cseti.f90
+++ b/mlprec/impl/smoother/mld_z_as_smoother_cseti.f90
@@ -53,7 +53,6 @@ subroutine mld_z_as_smoother_cseti(sm,what,val,info)
   info = psb_success_
   call psb_erractionsave(err_act)
 
-
   select case(psb_toupper(what)) 
   case('SUB_OVR') 
     sm%novr   = val
@@ -68,11 +67,7 @@ subroutine mld_z_as_smoother_cseti(sm,what,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
 end subroutine mld_z_as_smoother_cseti
diff --git a/mlprec/impl/smoother/mld_z_as_smoother_csetr.f90 b/mlprec/impl/smoother/mld_z_as_smoother_csetr.f90
index 0cdff4e1..89018dc4 100644
--- a/mlprec/impl/smoother/mld_z_as_smoother_csetr.f90
+++ b/mlprec/impl/smoother/mld_z_as_smoother_csetr.f90
@@ -63,11 +63,7 @@ subroutine mld_z_as_smoother_csetr(sm,what,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
 end subroutine mld_z_as_smoother_csetr
diff --git a/mlprec/impl/smoother/mld_z_as_smoother_free.f90 b/mlprec/impl/smoother/mld_z_as_smoother_free.f90
index fdb70a6c..d12ce4c8 100644
--- a/mlprec/impl/smoother/mld_z_as_smoother_free.f90
+++ b/mlprec/impl/smoother/mld_z_as_smoother_free.f90
@@ -66,11 +66,7 @@ subroutine mld_z_as_smoother_free(sm,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 mld_z_as_smoother_free
diff --git a/mlprec/impl/smoother/mld_z_as_smoother_setc.f90 b/mlprec/impl/smoother/mld_z_as_smoother_setc.f90
index ee28f39f..64ab5ddf 100644
--- a/mlprec/impl/smoother/mld_z_as_smoother_setc.f90
+++ b/mlprec/impl/smoother/mld_z_as_smoother_setc.f90
@@ -69,11 +69,7 @@ subroutine mld_z_as_smoother_setc(sm,what,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
 end subroutine mld_z_as_smoother_setc
diff --git a/mlprec/impl/smoother/mld_z_as_smoother_seti.f90 b/mlprec/impl/smoother/mld_z_as_smoother_seti.f90
index 1bfce6a7..6859b4e7 100644
--- a/mlprec/impl/smoother/mld_z_as_smoother_seti.f90
+++ b/mlprec/impl/smoother/mld_z_as_smoother_seti.f90
@@ -67,11 +67,7 @@ subroutine mld_z_as_smoother_seti(sm,what,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
 end subroutine mld_z_as_smoother_seti
diff --git a/mlprec/impl/smoother/mld_z_as_smoother_setr.f90 b/mlprec/impl/smoother/mld_z_as_smoother_setr.f90
index 9060af28..1170d4a3 100644
--- a/mlprec/impl/smoother/mld_z_as_smoother_setr.f90
+++ b/mlprec/impl/smoother/mld_z_as_smoother_setr.f90
@@ -63,11 +63,7 @@ subroutine mld_z_as_smoother_setr(sm,what,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
 end subroutine mld_z_as_smoother_setr
diff --git a/mlprec/impl/smoother/mld_z_base_smoother_apply.f90 b/mlprec/impl/smoother/mld_z_base_smoother_apply.f90
index d08e4e96..7e71d598 100644
--- a/mlprec/impl/smoother/mld_z_base_smoother_apply.f90
+++ b/mlprec/impl/smoother/mld_z_base_smoother_apply.f90
@@ -69,12 +69,8 @@ subroutine mld_z_base_smoother_apply(alpha,sm,x,beta,y,desc_data,trans,sweeps,wo
   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 mld_z_base_smoother_apply
diff --git a/mlprec/impl/smoother/mld_z_base_smoother_apply_vect.f90 b/mlprec/impl/smoother/mld_z_base_smoother_apply_vect.f90
index bffcd59d..9fe875e1 100644
--- a/mlprec/impl/smoother/mld_z_base_smoother_apply_vect.f90
+++ b/mlprec/impl/smoother/mld_z_base_smoother_apply_vect.f90
@@ -70,12 +70,8 @@ subroutine mld_z_base_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,&
   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 mld_z_base_smoother_apply_vect
diff --git a/mlprec/impl/smoother/mld_z_base_smoother_bld.f90 b/mlprec/impl/smoother/mld_z_base_smoother_bld.f90
index c36adf89..c7e0e2d0 100644
--- a/mlprec/impl/smoother/mld_z_base_smoother_bld.f90
+++ b/mlprec/impl/smoother/mld_z_base_smoother_bld.f90
@@ -68,11 +68,7 @@ subroutine mld_z_base_smoother_bld(a,desc_a,sm,upd,info,amold,vmold,imold)
   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 mld_z_base_smoother_bld
diff --git a/mlprec/impl/smoother/mld_z_base_smoother_check.f90 b/mlprec/impl/smoother/mld_z_base_smoother_check.f90
index f2cd5f30..9245d67b 100644
--- a/mlprec/impl/smoother/mld_z_base_smoother_check.f90
+++ b/mlprec/impl/smoother/mld_z_base_smoother_check.f90
@@ -64,11 +64,7 @@ subroutine mld_z_base_smoother_check(sm,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 mld_z_base_smoother_check
diff --git a/mlprec/impl/smoother/mld_z_base_smoother_clone.f90 b/mlprec/impl/smoother/mld_z_base_smoother_clone.f90
index 9524db7d..4bffd21f 100644
--- a/mlprec/impl/smoother/mld_z_base_smoother_clone.f90
+++ b/mlprec/impl/smoother/mld_z_base_smoother_clone.f90
@@ -57,11 +57,7 @@ subroutine mld_z_base_smoother_clone(sm,smout,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 mld_z_base_smoother_clone
diff --git a/mlprec/impl/smoother/mld_z_base_smoother_cnv.f90 b/mlprec/impl/smoother/mld_z_base_smoother_cnv.f90
index 65837751..f02d9398 100644
--- a/mlprec/impl/smoother/mld_z_base_smoother_cnv.f90
+++ b/mlprec/impl/smoother/mld_z_base_smoother_cnv.f90
@@ -65,11 +65,7 @@ subroutine mld_z_base_smoother_cnv(sm,info,amold,vmold,imold)
   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 mld_z_base_smoother_cnv
diff --git a/mlprec/impl/smoother/mld_z_base_smoother_csetc.f90 b/mlprec/impl/smoother/mld_z_base_smoother_csetc.f90
index e56b0504..18cfcf3c 100644
--- a/mlprec/impl/smoother/mld_z_base_smoother_csetc.f90
+++ b/mlprec/impl/smoother/mld_z_base_smoother_csetc.f90
@@ -68,11 +68,7 @@ subroutine mld_z_base_smoother_csetc(sm,what,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
 end subroutine mld_z_base_smoother_csetc
diff --git a/mlprec/impl/smoother/mld_z_base_smoother_cseti.f90 b/mlprec/impl/smoother/mld_z_base_smoother_cseti.f90
index d5d11409..25b1e8ba 100644
--- a/mlprec/impl/smoother/mld_z_base_smoother_cseti.f90
+++ b/mlprec/impl/smoother/mld_z_base_smoother_cseti.f90
@@ -59,11 +59,7 @@ subroutine mld_z_base_smoother_cseti(sm,what,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
 end subroutine mld_z_base_smoother_cseti
diff --git a/mlprec/impl/smoother/mld_z_base_smoother_csetr.f90 b/mlprec/impl/smoother/mld_z_base_smoother_csetr.f90
index 717f2ea2..709be518 100644
--- a/mlprec/impl/smoother/mld_z_base_smoother_csetr.f90
+++ b/mlprec/impl/smoother/mld_z_base_smoother_csetr.f90
@@ -63,11 +63,7 @@ subroutine mld_z_base_smoother_csetr(sm,what,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
 end subroutine mld_z_base_smoother_csetr
diff --git a/mlprec/impl/smoother/mld_z_base_smoother_descr.f90 b/mlprec/impl/smoother/mld_z_base_smoother_descr.f90
index 0f11c7fe..adf3e838 100644
--- a/mlprec/impl/smoother/mld_z_base_smoother_descr.f90
+++ b/mlprec/impl/smoother/mld_z_base_smoother_descr.f90
@@ -83,11 +83,7 @@ subroutine mld_z_base_smoother_descr(sm,info,iout,coarse)
   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 mld_z_base_smoother_descr
diff --git a/mlprec/impl/smoother/mld_z_base_smoother_free.f90 b/mlprec/impl/smoother/mld_z_base_smoother_free.f90
index e0af0361..cc049514 100644
--- a/mlprec/impl/smoother/mld_z_base_smoother_free.f90
+++ b/mlprec/impl/smoother/mld_z_base_smoother_free.f90
@@ -63,11 +63,7 @@ subroutine mld_z_base_smoother_free(sm,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 mld_z_base_smoother_free
diff --git a/mlprec/impl/smoother/mld_z_base_smoother_setc.f90 b/mlprec/impl/smoother/mld_z_base_smoother_setc.f90
index 70d90b22..c901b583 100644
--- a/mlprec/impl/smoother/mld_z_base_smoother_setc.f90
+++ b/mlprec/impl/smoother/mld_z_base_smoother_setc.f90
@@ -68,11 +68,7 @@ subroutine mld_z_base_smoother_setc(sm,what,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
 end subroutine mld_z_base_smoother_setc
diff --git a/mlprec/impl/smoother/mld_z_base_smoother_seti.f90 b/mlprec/impl/smoother/mld_z_base_smoother_seti.f90
index 166c6660..024b3158 100644
--- a/mlprec/impl/smoother/mld_z_base_smoother_seti.f90
+++ b/mlprec/impl/smoother/mld_z_base_smoother_seti.f90
@@ -59,11 +59,7 @@ subroutine mld_z_base_smoother_seti(sm,what,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
 end subroutine mld_z_base_smoother_seti
diff --git a/mlprec/impl/smoother/mld_z_base_smoother_setr.f90 b/mlprec/impl/smoother/mld_z_base_smoother_setr.f90
index ee5bc4cf..409a31f2 100644
--- a/mlprec/impl/smoother/mld_z_base_smoother_setr.f90
+++ b/mlprec/impl/smoother/mld_z_base_smoother_setr.f90
@@ -63,11 +63,7 @@ subroutine mld_z_base_smoother_setr(sm,what,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
 end subroutine mld_z_base_smoother_setr
diff --git a/mlprec/impl/smoother/mld_z_jac_smoother_apply.f90 b/mlprec/impl/smoother/mld_z_jac_smoother_apply.f90
index 295eedbf..d983407f 100644
--- a/mlprec/impl/smoother/mld_z_jac_smoother_apply.f90
+++ b/mlprec/impl/smoother/mld_z_jac_smoother_apply.f90
@@ -189,12 +189,8 @@ subroutine mld_z_jac_smoother_apply(alpha,sm,x,beta,y,desc_data,trans,sweeps,wor
   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 mld_z_jac_smoother_apply
diff --git a/mlprec/impl/smoother/mld_z_jac_smoother_apply_vect.f90 b/mlprec/impl/smoother/mld_z_jac_smoother_apply_vect.f90
index f122b8c5..a5731115 100644
--- a/mlprec/impl/smoother/mld_z_jac_smoother_apply_vect.f90
+++ b/mlprec/impl/smoother/mld_z_jac_smoother_apply_vect.f90
@@ -185,12 +185,8 @@ subroutine mld_z_jac_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,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
 
 end subroutine mld_z_jac_smoother_apply_vect
diff --git a/mlprec/impl/smoother/mld_z_jac_smoother_bld.f90 b/mlprec/impl/smoother/mld_z_jac_smoother_bld.f90
index 0d2cc5f7..f8e9040f 100644
--- a/mlprec/impl/smoother/mld_z_jac_smoother_bld.f90
+++ b/mlprec/impl/smoother/mld_z_jac_smoother_bld.f90
@@ -109,12 +109,8 @@ subroutine mld_z_jac_smoother_bld(a,desc_a,sm,upd,info,amold,vmold,imold)
   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 mld_z_jac_smoother_bld
diff --git a/mlprec/impl/smoother/mld_z_jac_smoother_clone.f90 b/mlprec/impl/smoother/mld_z_jac_smoother_clone.f90
index 20efcf50..e0e1379d 100644
--- a/mlprec/impl/smoother/mld_z_jac_smoother_clone.f90
+++ b/mlprec/impl/smoother/mld_z_jac_smoother_clone.f90
@@ -83,11 +83,7 @@ subroutine mld_z_jac_smoother_clone(sm,smout,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 mld_z_jac_smoother_clone
diff --git a/mlprec/impl/smoother/mld_z_jac_smoother_cnv.f90 b/mlprec/impl/smoother/mld_z_jac_smoother_cnv.f90
index 3f1a957c..7d3176ec 100644
--- a/mlprec/impl/smoother/mld_z_jac_smoother_cnv.f90
+++ b/mlprec/impl/smoother/mld_z_jac_smoother_cnv.f90
@@ -80,12 +80,8 @@ subroutine mld_z_jac_smoother_cnv(sm,info,amold,vmold,imold)
   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 mld_z_jac_smoother_cnv
diff --git a/mlprec/impl/solver/mld_c_base_solver_apply.f90 b/mlprec/impl/solver/mld_c_base_solver_apply.f90
index 7ce49077..887bdb8e 100644
--- a/mlprec/impl/solver/mld_c_base_solver_apply.f90
+++ b/mlprec/impl/solver/mld_c_base_solver_apply.f90
@@ -62,12 +62,8 @@ subroutine mld_c_base_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,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 mld_c_base_solver_apply
diff --git a/mlprec/impl/solver/mld_c_base_solver_apply_vect.f90 b/mlprec/impl/solver/mld_c_base_solver_apply_vect.f90
index f4ae4bde..3054d26a 100644
--- a/mlprec/impl/solver/mld_c_base_solver_apply_vect.f90
+++ b/mlprec/impl/solver/mld_c_base_solver_apply_vect.f90
@@ -62,12 +62,8 @@ subroutine mld_c_base_solver_apply_vect(alpha,sv,x,beta,y,desc_data,trans,work,i
   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 mld_c_base_solver_apply_vect
diff --git a/mlprec/impl/solver/mld_c_base_solver_bld.f90 b/mlprec/impl/solver/mld_c_base_solver_bld.f90
index ea09f2c1..0d68a067 100644
--- a/mlprec/impl/solver/mld_c_base_solver_bld.f90
+++ b/mlprec/impl/solver/mld_c_base_solver_bld.f90
@@ -64,11 +64,7 @@ subroutine mld_c_base_solver_bld(a,desc_a,sv,upd,info,b,amold,vmold,imold)
   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 mld_c_base_solver_bld
diff --git a/mlprec/impl/solver/mld_c_base_solver_check.f90 b/mlprec/impl/solver/mld_c_base_solver_check.f90
index 68f55db5..1a09d0ec 100644
--- a/mlprec/impl/solver/mld_c_base_solver_check.f90
+++ b/mlprec/impl/solver/mld_c_base_solver_check.f90
@@ -56,11 +56,7 @@ subroutine mld_c_base_solver_check(sv,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 mld_c_base_solver_check
diff --git a/mlprec/impl/solver/mld_c_base_solver_clone.f90 b/mlprec/impl/solver/mld_c_base_solver_clone.f90
index b81bef84..a5918b7a 100644
--- a/mlprec/impl/solver/mld_c_base_solver_clone.f90
+++ b/mlprec/impl/solver/mld_c_base_solver_clone.f90
@@ -57,11 +57,7 @@ subroutine mld_c_base_solver_clone(sv,svout,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 mld_c_base_solver_clone
diff --git a/mlprec/impl/solver/mld_c_base_solver_cnv.f90 b/mlprec/impl/solver/mld_c_base_solver_cnv.f90
index 3f61bc80..d5f88d40 100644
--- a/mlprec/impl/solver/mld_c_base_solver_cnv.f90
+++ b/mlprec/impl/solver/mld_c_base_solver_cnv.f90
@@ -58,11 +58,7 @@ subroutine mld_c_base_solver_cnv(sv,info,amold,vmold,imold)
   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 mld_c_base_solver_cnv
diff --git a/mlprec/impl/solver/mld_c_base_solver_csetc.f90 b/mlprec/impl/solver/mld_c_base_solver_csetc.f90
index 18821ab7..468603fe 100644
--- a/mlprec/impl/solver/mld_c_base_solver_csetc.f90
+++ b/mlprec/impl/solver/mld_c_base_solver_csetc.f90
@@ -64,11 +64,7 @@ subroutine mld_c_base_solver_csetc(sv,what,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
 end subroutine mld_c_base_solver_csetc
diff --git a/mlprec/impl/solver/mld_c_base_solver_descr.f90 b/mlprec/impl/solver/mld_c_base_solver_descr.f90
index 207fe901..ddfc1896 100644
--- a/mlprec/impl/solver/mld_c_base_solver_descr.f90
+++ b/mlprec/impl/solver/mld_c_base_solver_descr.f90
@@ -61,11 +61,7 @@ subroutine mld_c_base_solver_descr(sv,info,iout,coarse)
   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 mld_c_base_solver_descr
diff --git a/mlprec/impl/solver/mld_c_base_solver_free.f90 b/mlprec/impl/solver/mld_c_base_solver_free.f90
index 19b4a027..8a2ebb05 100644
--- a/mlprec/impl/solver/mld_c_base_solver_free.f90
+++ b/mlprec/impl/solver/mld_c_base_solver_free.f90
@@ -56,11 +56,7 @@ subroutine mld_c_base_solver_free(sv,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 mld_c_base_solver_free
diff --git a/mlprec/impl/solver/mld_c_base_solver_setc.f90 b/mlprec/impl/solver/mld_c_base_solver_setc.f90
index ecb17706..1d66945c 100644
--- a/mlprec/impl/solver/mld_c_base_solver_setc.f90
+++ b/mlprec/impl/solver/mld_c_base_solver_setc.f90
@@ -64,11 +64,7 @@ subroutine mld_c_base_solver_setc(sv,what,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
 end subroutine mld_c_base_solver_setc
diff --git a/mlprec/impl/solver/mld_c_diag_solver_apply.f90 b/mlprec/impl/solver/mld_c_diag_solver_apply.f90
index a93b5392..00638e3c 100644
--- a/mlprec/impl/solver/mld_c_diag_solver_apply.f90
+++ b/mlprec/impl/solver/mld_c_diag_solver_apply.f90
@@ -228,12 +228,8 @@ subroutine mld_c_diag_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,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 mld_c_diag_solver_apply
diff --git a/mlprec/impl/solver/mld_c_diag_solver_apply_vect.f90 b/mlprec/impl/solver/mld_c_diag_solver_apply_vect.f90
index 65650dd1..da286ee1 100644
--- a/mlprec/impl/solver/mld_c_diag_solver_apply_vect.f90
+++ b/mlprec/impl/solver/mld_c_diag_solver_apply_vect.f90
@@ -104,12 +104,8 @@ subroutine mld_c_diag_solver_apply_vect(alpha,sv,x,beta,y,desc_data,trans,work,i
   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 mld_c_diag_solver_apply_vect
diff --git a/mlprec/impl/solver/mld_c_diag_solver_bld.f90 b/mlprec/impl/solver/mld_c_diag_solver_bld.f90
index 25c844d9..02925009 100644
--- a/mlprec/impl/solver/mld_c_diag_solver_bld.f90
+++ b/mlprec/impl/solver/mld_c_diag_solver_bld.f90
@@ -114,11 +114,7 @@ subroutine mld_c_diag_solver_bld(a,desc_a,sv,upd,info,b,amold,vmold,imold)
   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 mld_c_diag_solver_bld
diff --git a/mlprec/impl/solver/mld_c_diag_solver_clone.f90 b/mlprec/impl/solver/mld_c_diag_solver_clone.f90
index a9a7bdc2..ec4cdefd 100644
--- a/mlprec/impl/solver/mld_c_diag_solver_clone.f90
+++ b/mlprec/impl/solver/mld_c_diag_solver_clone.f90
@@ -78,11 +78,7 @@ subroutine mld_c_diag_solver_clone(sv,svout,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 mld_c_diag_solver_clone
diff --git a/mlprec/impl/solver/mld_c_diag_solver_cnv.f90 b/mlprec/impl/solver/mld_c_diag_solver_cnv.f90
index 22f973e2..4bb0b966 100644
--- a/mlprec/impl/solver/mld_c_diag_solver_cnv.f90
+++ b/mlprec/impl/solver/mld_c_diag_solver_cnv.f90
@@ -71,11 +71,7 @@ subroutine mld_c_diag_solver_cnv(sv,info,amold,vmold,imold)
    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 mld_c_diag_solver_cnv
diff --git a/mlprec/impl/solver/mld_c_id_solver_apply.f90 b/mlprec/impl/solver/mld_c_id_solver_apply.f90
index ce4c4cab..b60c16b8 100644
--- a/mlprec/impl/solver/mld_c_id_solver_apply.f90
+++ b/mlprec/impl/solver/mld_c_id_solver_apply.f90
@@ -74,12 +74,8 @@ subroutine mld_c_id_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,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 mld_c_id_solver_apply
diff --git a/mlprec/impl/solver/mld_c_id_solver_apply_vect.f90 b/mlprec/impl/solver/mld_c_id_solver_apply_vect.f90
index 2894c611..0845c20f 100644
--- a/mlprec/impl/solver/mld_c_id_solver_apply_vect.f90
+++ b/mlprec/impl/solver/mld_c_id_solver_apply_vect.f90
@@ -74,12 +74,8 @@ subroutine mld_c_id_solver_apply_vect(alpha,sv,x,beta,y,desc_data,trans,work,inf
   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 mld_c_id_solver_apply_vect
diff --git a/mlprec/impl/solver/mld_c_id_solver_clone.f90 b/mlprec/impl/solver/mld_c_id_solver_clone.f90
index 2a975703..ddd69330 100644
--- a/mlprec/impl/solver/mld_c_id_solver_clone.f90
+++ b/mlprec/impl/solver/mld_c_id_solver_clone.f90
@@ -76,11 +76,7 @@ subroutine mld_c_id_solver_clone(sv,svout,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 mld_c_id_solver_clone
diff --git a/mlprec/impl/solver/mld_c_ilu_solver_apply.f90 b/mlprec/impl/solver/mld_c_ilu_solver_apply.f90
index ea5b86de..05eb7d54 100644
--- a/mlprec/impl/solver/mld_c_ilu_solver_apply.f90
+++ b/mlprec/impl/solver/mld_c_ilu_solver_apply.f90
@@ -141,12 +141,8 @@ subroutine mld_c_ilu_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,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 mld_c_ilu_solver_apply
diff --git a/mlprec/impl/solver/mld_c_ilu_solver_apply_vect.f90 b/mlprec/impl/solver/mld_c_ilu_solver_apply_vect.f90
index bb6bf914..842c5b61 100644
--- a/mlprec/impl/solver/mld_c_ilu_solver_apply_vect.f90
+++ b/mlprec/impl/solver/mld_c_ilu_solver_apply_vect.f90
@@ -173,12 +173,8 @@ subroutine mld_c_ilu_solver_apply_vect(alpha,sv,x,beta,y,desc_data,trans,work,in
   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 mld_c_ilu_solver_apply_vect
diff --git a/mlprec/impl/solver/mld_c_ilu_solver_bld.f90 b/mlprec/impl/solver/mld_c_ilu_solver_bld.f90
index 70db6e43..65acadfa 100644
--- a/mlprec/impl/solver/mld_c_ilu_solver_bld.f90
+++ b/mlprec/impl/solver/mld_c_ilu_solver_bld.f90
@@ -207,11 +207,7 @@ subroutine mld_c_ilu_solver_bld(a,desc_a,sv,upd,info,b,amold,vmold,imold)
   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 mld_c_ilu_solver_bld
diff --git a/mlprec/impl/solver/mld_c_ilu_solver_clone.f90 b/mlprec/impl/solver/mld_c_ilu_solver_clone.f90
index c3ebcd58..9284a458 100644
--- a/mlprec/impl/solver/mld_c_ilu_solver_clone.f90
+++ b/mlprec/impl/solver/mld_c_ilu_solver_clone.f90
@@ -86,11 +86,7 @@ subroutine mld_c_ilu_solver_clone(sv,svout,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 mld_c_ilu_solver_clone
diff --git a/mlprec/impl/solver/mld_c_ilu_solver_cnv.f90 b/mlprec/impl/solver/mld_c_ilu_solver_cnv.f90
index a4e60463..6eed6fdb 100644
--- a/mlprec/impl/solver/mld_c_ilu_solver_cnv.f90
+++ b/mlprec/impl/solver/mld_c_ilu_solver_cnv.f90
@@ -71,11 +71,7 @@ subroutine mld_c_ilu_solver_cnv(sv,info,amold,vmold,imold)
   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 mld_c_ilu_solver_cnv
diff --git a/mlprec/impl/solver/mld_d_base_solver_apply.f90 b/mlprec/impl/solver/mld_d_base_solver_apply.f90
index 7551be37..8e32e763 100644
--- a/mlprec/impl/solver/mld_d_base_solver_apply.f90
+++ b/mlprec/impl/solver/mld_d_base_solver_apply.f90
@@ -62,12 +62,8 @@ subroutine mld_d_base_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,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 mld_d_base_solver_apply
diff --git a/mlprec/impl/solver/mld_d_base_solver_apply_vect.f90 b/mlprec/impl/solver/mld_d_base_solver_apply_vect.f90
index 8dd4bee2..381043e2 100644
--- a/mlprec/impl/solver/mld_d_base_solver_apply_vect.f90
+++ b/mlprec/impl/solver/mld_d_base_solver_apply_vect.f90
@@ -62,12 +62,8 @@ subroutine mld_d_base_solver_apply_vect(alpha,sv,x,beta,y,desc_data,trans,work,i
   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 mld_d_base_solver_apply_vect
diff --git a/mlprec/impl/solver/mld_d_base_solver_bld.f90 b/mlprec/impl/solver/mld_d_base_solver_bld.f90
index d90c0417..25286f0f 100644
--- a/mlprec/impl/solver/mld_d_base_solver_bld.f90
+++ b/mlprec/impl/solver/mld_d_base_solver_bld.f90
@@ -64,11 +64,7 @@ subroutine mld_d_base_solver_bld(a,desc_a,sv,upd,info,b,amold,vmold,imold)
   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 mld_d_base_solver_bld
diff --git a/mlprec/impl/solver/mld_d_base_solver_check.f90 b/mlprec/impl/solver/mld_d_base_solver_check.f90
index a0ab6334..c1b1fd8d 100644
--- a/mlprec/impl/solver/mld_d_base_solver_check.f90
+++ b/mlprec/impl/solver/mld_d_base_solver_check.f90
@@ -56,11 +56,7 @@ subroutine mld_d_base_solver_check(sv,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 mld_d_base_solver_check
diff --git a/mlprec/impl/solver/mld_d_base_solver_clone.f90 b/mlprec/impl/solver/mld_d_base_solver_clone.f90
index 022a2c4f..20e63f3b 100644
--- a/mlprec/impl/solver/mld_d_base_solver_clone.f90
+++ b/mlprec/impl/solver/mld_d_base_solver_clone.f90
@@ -57,11 +57,7 @@ subroutine mld_d_base_solver_clone(sv,svout,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 mld_d_base_solver_clone
diff --git a/mlprec/impl/solver/mld_d_base_solver_cnv.f90 b/mlprec/impl/solver/mld_d_base_solver_cnv.f90
index 6076bf39..b7afc5c6 100644
--- a/mlprec/impl/solver/mld_d_base_solver_cnv.f90
+++ b/mlprec/impl/solver/mld_d_base_solver_cnv.f90
@@ -58,11 +58,7 @@ subroutine mld_d_base_solver_cnv(sv,info,amold,vmold,imold)
   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 mld_d_base_solver_cnv
diff --git a/mlprec/impl/solver/mld_d_base_solver_csetc.f90 b/mlprec/impl/solver/mld_d_base_solver_csetc.f90
index 6ee1dbfc..3e42497b 100644
--- a/mlprec/impl/solver/mld_d_base_solver_csetc.f90
+++ b/mlprec/impl/solver/mld_d_base_solver_csetc.f90
@@ -64,11 +64,7 @@ subroutine mld_d_base_solver_csetc(sv,what,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
 end subroutine mld_d_base_solver_csetc
diff --git a/mlprec/impl/solver/mld_d_base_solver_descr.f90 b/mlprec/impl/solver/mld_d_base_solver_descr.f90
index d6a99239..ad7071f8 100644
--- a/mlprec/impl/solver/mld_d_base_solver_descr.f90
+++ b/mlprec/impl/solver/mld_d_base_solver_descr.f90
@@ -61,11 +61,7 @@ subroutine mld_d_base_solver_descr(sv,info,iout,coarse)
   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 mld_d_base_solver_descr
diff --git a/mlprec/impl/solver/mld_d_base_solver_free.f90 b/mlprec/impl/solver/mld_d_base_solver_free.f90
index 1c0a1b1f..b5b056e5 100644
--- a/mlprec/impl/solver/mld_d_base_solver_free.f90
+++ b/mlprec/impl/solver/mld_d_base_solver_free.f90
@@ -56,11 +56,7 @@ subroutine mld_d_base_solver_free(sv,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 mld_d_base_solver_free
diff --git a/mlprec/impl/solver/mld_d_base_solver_setc.f90 b/mlprec/impl/solver/mld_d_base_solver_setc.f90
index f01a7246..3ec6836a 100644
--- a/mlprec/impl/solver/mld_d_base_solver_setc.f90
+++ b/mlprec/impl/solver/mld_d_base_solver_setc.f90
@@ -64,11 +64,7 @@ subroutine mld_d_base_solver_setc(sv,what,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
 end subroutine mld_d_base_solver_setc
diff --git a/mlprec/impl/solver/mld_d_diag_solver_apply.f90 b/mlprec/impl/solver/mld_d_diag_solver_apply.f90
index 32703cd3..00f40cec 100644
--- a/mlprec/impl/solver/mld_d_diag_solver_apply.f90
+++ b/mlprec/impl/solver/mld_d_diag_solver_apply.f90
@@ -228,12 +228,8 @@ subroutine mld_d_diag_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,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 mld_d_diag_solver_apply
diff --git a/mlprec/impl/solver/mld_d_diag_solver_apply_vect.f90 b/mlprec/impl/solver/mld_d_diag_solver_apply_vect.f90
index d63f93ec..32a745b5 100644
--- a/mlprec/impl/solver/mld_d_diag_solver_apply_vect.f90
+++ b/mlprec/impl/solver/mld_d_diag_solver_apply_vect.f90
@@ -104,12 +104,8 @@ subroutine mld_d_diag_solver_apply_vect(alpha,sv,x,beta,y,desc_data,trans,work,i
   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 mld_d_diag_solver_apply_vect
diff --git a/mlprec/impl/solver/mld_d_diag_solver_bld.f90 b/mlprec/impl/solver/mld_d_diag_solver_bld.f90
index b45deed9..b78efc72 100644
--- a/mlprec/impl/solver/mld_d_diag_solver_bld.f90
+++ b/mlprec/impl/solver/mld_d_diag_solver_bld.f90
@@ -114,11 +114,7 @@ subroutine mld_d_diag_solver_bld(a,desc_a,sv,upd,info,b,amold,vmold,imold)
   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 mld_d_diag_solver_bld
diff --git a/mlprec/impl/solver/mld_d_diag_solver_clone.f90 b/mlprec/impl/solver/mld_d_diag_solver_clone.f90
index 6c1f72eb..c6cda1f7 100644
--- a/mlprec/impl/solver/mld_d_diag_solver_clone.f90
+++ b/mlprec/impl/solver/mld_d_diag_solver_clone.f90
@@ -78,11 +78,7 @@ subroutine mld_d_diag_solver_clone(sv,svout,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 mld_d_diag_solver_clone
diff --git a/mlprec/impl/solver/mld_d_diag_solver_cnv.f90 b/mlprec/impl/solver/mld_d_diag_solver_cnv.f90
index 9d7cea47..000ab3f7 100644
--- a/mlprec/impl/solver/mld_d_diag_solver_cnv.f90
+++ b/mlprec/impl/solver/mld_d_diag_solver_cnv.f90
@@ -71,11 +71,7 @@ subroutine mld_d_diag_solver_cnv(sv,info,amold,vmold,imold)
    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 mld_d_diag_solver_cnv
diff --git a/mlprec/impl/solver/mld_d_id_solver_apply.f90 b/mlprec/impl/solver/mld_d_id_solver_apply.f90
index 2e2bb5f0..8447f90b 100644
--- a/mlprec/impl/solver/mld_d_id_solver_apply.f90
+++ b/mlprec/impl/solver/mld_d_id_solver_apply.f90
@@ -74,12 +74,8 @@ subroutine mld_d_id_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,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 mld_d_id_solver_apply
diff --git a/mlprec/impl/solver/mld_d_id_solver_apply_vect.f90 b/mlprec/impl/solver/mld_d_id_solver_apply_vect.f90
index 867f0d64..643bfad1 100644
--- a/mlprec/impl/solver/mld_d_id_solver_apply_vect.f90
+++ b/mlprec/impl/solver/mld_d_id_solver_apply_vect.f90
@@ -74,12 +74,8 @@ subroutine mld_d_id_solver_apply_vect(alpha,sv,x,beta,y,desc_data,trans,work,inf
   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 mld_d_id_solver_apply_vect
diff --git a/mlprec/impl/solver/mld_d_id_solver_clone.f90 b/mlprec/impl/solver/mld_d_id_solver_clone.f90
index d7dc801d..f2bfe2a4 100644
--- a/mlprec/impl/solver/mld_d_id_solver_clone.f90
+++ b/mlprec/impl/solver/mld_d_id_solver_clone.f90
@@ -76,11 +76,7 @@ subroutine mld_d_id_solver_clone(sv,svout,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 mld_d_id_solver_clone
diff --git a/mlprec/impl/solver/mld_d_ilu_solver_apply.f90 b/mlprec/impl/solver/mld_d_ilu_solver_apply.f90
index dc3216bb..c5daf43b 100644
--- a/mlprec/impl/solver/mld_d_ilu_solver_apply.f90
+++ b/mlprec/impl/solver/mld_d_ilu_solver_apply.f90
@@ -141,12 +141,8 @@ subroutine mld_d_ilu_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,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 mld_d_ilu_solver_apply
diff --git a/mlprec/impl/solver/mld_d_ilu_solver_apply_vect.f90 b/mlprec/impl/solver/mld_d_ilu_solver_apply_vect.f90
index 878d3890..3600ac38 100644
--- a/mlprec/impl/solver/mld_d_ilu_solver_apply_vect.f90
+++ b/mlprec/impl/solver/mld_d_ilu_solver_apply_vect.f90
@@ -173,12 +173,8 @@ subroutine mld_d_ilu_solver_apply_vect(alpha,sv,x,beta,y,desc_data,trans,work,in
   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 mld_d_ilu_solver_apply_vect
diff --git a/mlprec/impl/solver/mld_d_ilu_solver_bld.f90 b/mlprec/impl/solver/mld_d_ilu_solver_bld.f90
index 62340845..db7537c4 100644
--- a/mlprec/impl/solver/mld_d_ilu_solver_bld.f90
+++ b/mlprec/impl/solver/mld_d_ilu_solver_bld.f90
@@ -207,11 +207,7 @@ subroutine mld_d_ilu_solver_bld(a,desc_a,sv,upd,info,b,amold,vmold,imold)
   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 mld_d_ilu_solver_bld
diff --git a/mlprec/impl/solver/mld_d_ilu_solver_clone.f90 b/mlprec/impl/solver/mld_d_ilu_solver_clone.f90
index 56a20eb8..686abec1 100644
--- a/mlprec/impl/solver/mld_d_ilu_solver_clone.f90
+++ b/mlprec/impl/solver/mld_d_ilu_solver_clone.f90
@@ -86,11 +86,7 @@ subroutine mld_d_ilu_solver_clone(sv,svout,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 mld_d_ilu_solver_clone
diff --git a/mlprec/impl/solver/mld_d_ilu_solver_cnv.f90 b/mlprec/impl/solver/mld_d_ilu_solver_cnv.f90
index 531bbe2b..202f4096 100644
--- a/mlprec/impl/solver/mld_d_ilu_solver_cnv.f90
+++ b/mlprec/impl/solver/mld_d_ilu_solver_cnv.f90
@@ -71,11 +71,7 @@ subroutine mld_d_ilu_solver_cnv(sv,info,amold,vmold,imold)
   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 mld_d_ilu_solver_cnv
diff --git a/mlprec/impl/solver/mld_s_base_solver_apply.f90 b/mlprec/impl/solver/mld_s_base_solver_apply.f90
index eac44b9b..61a32b2d 100644
--- a/mlprec/impl/solver/mld_s_base_solver_apply.f90
+++ b/mlprec/impl/solver/mld_s_base_solver_apply.f90
@@ -62,12 +62,8 @@ subroutine mld_s_base_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,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 mld_s_base_solver_apply
diff --git a/mlprec/impl/solver/mld_s_base_solver_apply_vect.f90 b/mlprec/impl/solver/mld_s_base_solver_apply_vect.f90
index de731df8..b98d3fd6 100644
--- a/mlprec/impl/solver/mld_s_base_solver_apply_vect.f90
+++ b/mlprec/impl/solver/mld_s_base_solver_apply_vect.f90
@@ -62,12 +62,8 @@ subroutine mld_s_base_solver_apply_vect(alpha,sv,x,beta,y,desc_data,trans,work,i
   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 mld_s_base_solver_apply_vect
diff --git a/mlprec/impl/solver/mld_s_base_solver_bld.f90 b/mlprec/impl/solver/mld_s_base_solver_bld.f90
index f211daf9..4686c54c 100644
--- a/mlprec/impl/solver/mld_s_base_solver_bld.f90
+++ b/mlprec/impl/solver/mld_s_base_solver_bld.f90
@@ -64,11 +64,7 @@ subroutine mld_s_base_solver_bld(a,desc_a,sv,upd,info,b,amold,vmold,imold)
   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 mld_s_base_solver_bld
diff --git a/mlprec/impl/solver/mld_s_base_solver_check.f90 b/mlprec/impl/solver/mld_s_base_solver_check.f90
index aaba489b..6a1b84e8 100644
--- a/mlprec/impl/solver/mld_s_base_solver_check.f90
+++ b/mlprec/impl/solver/mld_s_base_solver_check.f90
@@ -56,11 +56,7 @@ subroutine mld_s_base_solver_check(sv,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 mld_s_base_solver_check
diff --git a/mlprec/impl/solver/mld_s_base_solver_clone.f90 b/mlprec/impl/solver/mld_s_base_solver_clone.f90
index 8228acbf..bfa70933 100644
--- a/mlprec/impl/solver/mld_s_base_solver_clone.f90
+++ b/mlprec/impl/solver/mld_s_base_solver_clone.f90
@@ -57,11 +57,7 @@ subroutine mld_s_base_solver_clone(sv,svout,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 mld_s_base_solver_clone
diff --git a/mlprec/impl/solver/mld_s_base_solver_cnv.f90 b/mlprec/impl/solver/mld_s_base_solver_cnv.f90
index bb24ea08..74e02141 100644
--- a/mlprec/impl/solver/mld_s_base_solver_cnv.f90
+++ b/mlprec/impl/solver/mld_s_base_solver_cnv.f90
@@ -58,11 +58,7 @@ subroutine mld_s_base_solver_cnv(sv,info,amold,vmold,imold)
   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 mld_s_base_solver_cnv
diff --git a/mlprec/impl/solver/mld_s_base_solver_csetc.f90 b/mlprec/impl/solver/mld_s_base_solver_csetc.f90
index 8cc45c7c..c125028d 100644
--- a/mlprec/impl/solver/mld_s_base_solver_csetc.f90
+++ b/mlprec/impl/solver/mld_s_base_solver_csetc.f90
@@ -64,11 +64,7 @@ subroutine mld_s_base_solver_csetc(sv,what,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
 end subroutine mld_s_base_solver_csetc
diff --git a/mlprec/impl/solver/mld_s_base_solver_descr.f90 b/mlprec/impl/solver/mld_s_base_solver_descr.f90
index fc5706f9..5215dc22 100644
--- a/mlprec/impl/solver/mld_s_base_solver_descr.f90
+++ b/mlprec/impl/solver/mld_s_base_solver_descr.f90
@@ -61,11 +61,7 @@ subroutine mld_s_base_solver_descr(sv,info,iout,coarse)
   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 mld_s_base_solver_descr
diff --git a/mlprec/impl/solver/mld_s_base_solver_free.f90 b/mlprec/impl/solver/mld_s_base_solver_free.f90
index f1bb01b6..de86d0e5 100644
--- a/mlprec/impl/solver/mld_s_base_solver_free.f90
+++ b/mlprec/impl/solver/mld_s_base_solver_free.f90
@@ -56,11 +56,7 @@ subroutine mld_s_base_solver_free(sv,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 mld_s_base_solver_free
diff --git a/mlprec/impl/solver/mld_s_base_solver_setc.f90 b/mlprec/impl/solver/mld_s_base_solver_setc.f90
index 4651c852..2d983005 100644
--- a/mlprec/impl/solver/mld_s_base_solver_setc.f90
+++ b/mlprec/impl/solver/mld_s_base_solver_setc.f90
@@ -64,11 +64,7 @@ subroutine mld_s_base_solver_setc(sv,what,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
 end subroutine mld_s_base_solver_setc
diff --git a/mlprec/impl/solver/mld_s_diag_solver_apply.f90 b/mlprec/impl/solver/mld_s_diag_solver_apply.f90
index 7e11839b..fd624297 100644
--- a/mlprec/impl/solver/mld_s_diag_solver_apply.f90
+++ b/mlprec/impl/solver/mld_s_diag_solver_apply.f90
@@ -228,12 +228,8 @@ subroutine mld_s_diag_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,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 mld_s_diag_solver_apply
diff --git a/mlprec/impl/solver/mld_s_diag_solver_apply_vect.f90 b/mlprec/impl/solver/mld_s_diag_solver_apply_vect.f90
index bc6f6f07..f4067956 100644
--- a/mlprec/impl/solver/mld_s_diag_solver_apply_vect.f90
+++ b/mlprec/impl/solver/mld_s_diag_solver_apply_vect.f90
@@ -104,12 +104,8 @@ subroutine mld_s_diag_solver_apply_vect(alpha,sv,x,beta,y,desc_data,trans,work,i
   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 mld_s_diag_solver_apply_vect
diff --git a/mlprec/impl/solver/mld_s_diag_solver_bld.f90 b/mlprec/impl/solver/mld_s_diag_solver_bld.f90
index 9ef1c6db..146790ac 100644
--- a/mlprec/impl/solver/mld_s_diag_solver_bld.f90
+++ b/mlprec/impl/solver/mld_s_diag_solver_bld.f90
@@ -114,11 +114,7 @@ subroutine mld_s_diag_solver_bld(a,desc_a,sv,upd,info,b,amold,vmold,imold)
   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 mld_s_diag_solver_bld
diff --git a/mlprec/impl/solver/mld_s_diag_solver_clone.f90 b/mlprec/impl/solver/mld_s_diag_solver_clone.f90
index 386fabf0..8d209da5 100644
--- a/mlprec/impl/solver/mld_s_diag_solver_clone.f90
+++ b/mlprec/impl/solver/mld_s_diag_solver_clone.f90
@@ -78,11 +78,7 @@ subroutine mld_s_diag_solver_clone(sv,svout,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 mld_s_diag_solver_clone
diff --git a/mlprec/impl/solver/mld_s_diag_solver_cnv.f90 b/mlprec/impl/solver/mld_s_diag_solver_cnv.f90
index fbcae73f..dd904001 100644
--- a/mlprec/impl/solver/mld_s_diag_solver_cnv.f90
+++ b/mlprec/impl/solver/mld_s_diag_solver_cnv.f90
@@ -71,11 +71,7 @@ subroutine mld_s_diag_solver_cnv(sv,info,amold,vmold,imold)
    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 mld_s_diag_solver_cnv
diff --git a/mlprec/impl/solver/mld_s_id_solver_apply.f90 b/mlprec/impl/solver/mld_s_id_solver_apply.f90
index c2bef19d..3f8f2839 100644
--- a/mlprec/impl/solver/mld_s_id_solver_apply.f90
+++ b/mlprec/impl/solver/mld_s_id_solver_apply.f90
@@ -74,12 +74,8 @@ subroutine mld_s_id_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,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 mld_s_id_solver_apply
diff --git a/mlprec/impl/solver/mld_s_id_solver_apply_vect.f90 b/mlprec/impl/solver/mld_s_id_solver_apply_vect.f90
index 51802740..29dbc771 100644
--- a/mlprec/impl/solver/mld_s_id_solver_apply_vect.f90
+++ b/mlprec/impl/solver/mld_s_id_solver_apply_vect.f90
@@ -74,12 +74,8 @@ subroutine mld_s_id_solver_apply_vect(alpha,sv,x,beta,y,desc_data,trans,work,inf
   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 mld_s_id_solver_apply_vect
diff --git a/mlprec/impl/solver/mld_s_id_solver_clone.f90 b/mlprec/impl/solver/mld_s_id_solver_clone.f90
index aeee69c1..85f3c83a 100644
--- a/mlprec/impl/solver/mld_s_id_solver_clone.f90
+++ b/mlprec/impl/solver/mld_s_id_solver_clone.f90
@@ -76,11 +76,7 @@ subroutine mld_s_id_solver_clone(sv,svout,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 mld_s_id_solver_clone
diff --git a/mlprec/impl/solver/mld_s_ilu_solver_apply.f90 b/mlprec/impl/solver/mld_s_ilu_solver_apply.f90
index b636ee32..ffb24974 100644
--- a/mlprec/impl/solver/mld_s_ilu_solver_apply.f90
+++ b/mlprec/impl/solver/mld_s_ilu_solver_apply.f90
@@ -141,12 +141,8 @@ subroutine mld_s_ilu_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,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 mld_s_ilu_solver_apply
diff --git a/mlprec/impl/solver/mld_s_ilu_solver_apply_vect.f90 b/mlprec/impl/solver/mld_s_ilu_solver_apply_vect.f90
index 4c35c42a..312bbeb5 100644
--- a/mlprec/impl/solver/mld_s_ilu_solver_apply_vect.f90
+++ b/mlprec/impl/solver/mld_s_ilu_solver_apply_vect.f90
@@ -173,12 +173,8 @@ subroutine mld_s_ilu_solver_apply_vect(alpha,sv,x,beta,y,desc_data,trans,work,in
   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 mld_s_ilu_solver_apply_vect
diff --git a/mlprec/impl/solver/mld_s_ilu_solver_bld.f90 b/mlprec/impl/solver/mld_s_ilu_solver_bld.f90
index 23788d67..50247207 100644
--- a/mlprec/impl/solver/mld_s_ilu_solver_bld.f90
+++ b/mlprec/impl/solver/mld_s_ilu_solver_bld.f90
@@ -207,11 +207,7 @@ subroutine mld_s_ilu_solver_bld(a,desc_a,sv,upd,info,b,amold,vmold,imold)
   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 mld_s_ilu_solver_bld
diff --git a/mlprec/impl/solver/mld_s_ilu_solver_clone.f90 b/mlprec/impl/solver/mld_s_ilu_solver_clone.f90
index a9f37def..473bd8b1 100644
--- a/mlprec/impl/solver/mld_s_ilu_solver_clone.f90
+++ b/mlprec/impl/solver/mld_s_ilu_solver_clone.f90
@@ -86,11 +86,7 @@ subroutine mld_s_ilu_solver_clone(sv,svout,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 mld_s_ilu_solver_clone
diff --git a/mlprec/impl/solver/mld_s_ilu_solver_cnv.f90 b/mlprec/impl/solver/mld_s_ilu_solver_cnv.f90
index f6f0f6c6..d8c6330f 100644
--- a/mlprec/impl/solver/mld_s_ilu_solver_cnv.f90
+++ b/mlprec/impl/solver/mld_s_ilu_solver_cnv.f90
@@ -71,11 +71,7 @@ subroutine mld_s_ilu_solver_cnv(sv,info,amold,vmold,imold)
   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 mld_s_ilu_solver_cnv
diff --git a/mlprec/impl/solver/mld_z_base_solver_apply.f90 b/mlprec/impl/solver/mld_z_base_solver_apply.f90
index 59ad6751..3dc1ca64 100644
--- a/mlprec/impl/solver/mld_z_base_solver_apply.f90
+++ b/mlprec/impl/solver/mld_z_base_solver_apply.f90
@@ -62,12 +62,8 @@ subroutine mld_z_base_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,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 mld_z_base_solver_apply
diff --git a/mlprec/impl/solver/mld_z_base_solver_apply_vect.f90 b/mlprec/impl/solver/mld_z_base_solver_apply_vect.f90
index dca93b07..ef4e3895 100644
--- a/mlprec/impl/solver/mld_z_base_solver_apply_vect.f90
+++ b/mlprec/impl/solver/mld_z_base_solver_apply_vect.f90
@@ -62,12 +62,8 @@ subroutine mld_z_base_solver_apply_vect(alpha,sv,x,beta,y,desc_data,trans,work,i
   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 mld_z_base_solver_apply_vect
diff --git a/mlprec/impl/solver/mld_z_base_solver_bld.f90 b/mlprec/impl/solver/mld_z_base_solver_bld.f90
index eb38916e..ad830a07 100644
--- a/mlprec/impl/solver/mld_z_base_solver_bld.f90
+++ b/mlprec/impl/solver/mld_z_base_solver_bld.f90
@@ -64,11 +64,7 @@ subroutine mld_z_base_solver_bld(a,desc_a,sv,upd,info,b,amold,vmold,imold)
   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 mld_z_base_solver_bld
diff --git a/mlprec/impl/solver/mld_z_base_solver_check.f90 b/mlprec/impl/solver/mld_z_base_solver_check.f90
index a9551b2f..ac23cbf3 100644
--- a/mlprec/impl/solver/mld_z_base_solver_check.f90
+++ b/mlprec/impl/solver/mld_z_base_solver_check.f90
@@ -56,11 +56,7 @@ subroutine mld_z_base_solver_check(sv,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 mld_z_base_solver_check
diff --git a/mlprec/impl/solver/mld_z_base_solver_clone.f90 b/mlprec/impl/solver/mld_z_base_solver_clone.f90
index 68949032..07885eac 100644
--- a/mlprec/impl/solver/mld_z_base_solver_clone.f90
+++ b/mlprec/impl/solver/mld_z_base_solver_clone.f90
@@ -57,11 +57,7 @@ subroutine mld_z_base_solver_clone(sv,svout,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 mld_z_base_solver_clone
diff --git a/mlprec/impl/solver/mld_z_base_solver_cnv.f90 b/mlprec/impl/solver/mld_z_base_solver_cnv.f90
index 01c15785..8b798b41 100644
--- a/mlprec/impl/solver/mld_z_base_solver_cnv.f90
+++ b/mlprec/impl/solver/mld_z_base_solver_cnv.f90
@@ -58,11 +58,7 @@ subroutine mld_z_base_solver_cnv(sv,info,amold,vmold,imold)
   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 mld_z_base_solver_cnv
diff --git a/mlprec/impl/solver/mld_z_base_solver_csetc.f90 b/mlprec/impl/solver/mld_z_base_solver_csetc.f90
index e67f15dd..a92c9757 100644
--- a/mlprec/impl/solver/mld_z_base_solver_csetc.f90
+++ b/mlprec/impl/solver/mld_z_base_solver_csetc.f90
@@ -64,11 +64,7 @@ subroutine mld_z_base_solver_csetc(sv,what,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
 end subroutine mld_z_base_solver_csetc
diff --git a/mlprec/impl/solver/mld_z_base_solver_descr.f90 b/mlprec/impl/solver/mld_z_base_solver_descr.f90
index 4ca2c3c5..70dd5538 100644
--- a/mlprec/impl/solver/mld_z_base_solver_descr.f90
+++ b/mlprec/impl/solver/mld_z_base_solver_descr.f90
@@ -61,11 +61,7 @@ subroutine mld_z_base_solver_descr(sv,info,iout,coarse)
   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 mld_z_base_solver_descr
diff --git a/mlprec/impl/solver/mld_z_base_solver_free.f90 b/mlprec/impl/solver/mld_z_base_solver_free.f90
index 71d2e221..f98c8e9d 100644
--- a/mlprec/impl/solver/mld_z_base_solver_free.f90
+++ b/mlprec/impl/solver/mld_z_base_solver_free.f90
@@ -56,11 +56,7 @@ subroutine mld_z_base_solver_free(sv,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 mld_z_base_solver_free
diff --git a/mlprec/impl/solver/mld_z_base_solver_setc.f90 b/mlprec/impl/solver/mld_z_base_solver_setc.f90
index a97f4239..9f8c43ab 100644
--- a/mlprec/impl/solver/mld_z_base_solver_setc.f90
+++ b/mlprec/impl/solver/mld_z_base_solver_setc.f90
@@ -64,11 +64,7 @@ subroutine mld_z_base_solver_setc(sv,what,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
 end subroutine mld_z_base_solver_setc
diff --git a/mlprec/impl/solver/mld_z_diag_solver_apply.f90 b/mlprec/impl/solver/mld_z_diag_solver_apply.f90
index c6c21a26..aa502032 100644
--- a/mlprec/impl/solver/mld_z_diag_solver_apply.f90
+++ b/mlprec/impl/solver/mld_z_diag_solver_apply.f90
@@ -228,12 +228,8 @@ subroutine mld_z_diag_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,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 mld_z_diag_solver_apply
diff --git a/mlprec/impl/solver/mld_z_diag_solver_apply_vect.f90 b/mlprec/impl/solver/mld_z_diag_solver_apply_vect.f90
index fc5f6b15..68cc9f2f 100644
--- a/mlprec/impl/solver/mld_z_diag_solver_apply_vect.f90
+++ b/mlprec/impl/solver/mld_z_diag_solver_apply_vect.f90
@@ -104,12 +104,8 @@ subroutine mld_z_diag_solver_apply_vect(alpha,sv,x,beta,y,desc_data,trans,work,i
   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 mld_z_diag_solver_apply_vect
diff --git a/mlprec/impl/solver/mld_z_diag_solver_bld.f90 b/mlprec/impl/solver/mld_z_diag_solver_bld.f90
index 9cf8bb68..695eb607 100644
--- a/mlprec/impl/solver/mld_z_diag_solver_bld.f90
+++ b/mlprec/impl/solver/mld_z_diag_solver_bld.f90
@@ -114,11 +114,7 @@ subroutine mld_z_diag_solver_bld(a,desc_a,sv,upd,info,b,amold,vmold,imold)
   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 mld_z_diag_solver_bld
diff --git a/mlprec/impl/solver/mld_z_diag_solver_clone.f90 b/mlprec/impl/solver/mld_z_diag_solver_clone.f90
index d9c60b55..2929d668 100644
--- a/mlprec/impl/solver/mld_z_diag_solver_clone.f90
+++ b/mlprec/impl/solver/mld_z_diag_solver_clone.f90
@@ -78,11 +78,7 @@ subroutine mld_z_diag_solver_clone(sv,svout,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 mld_z_diag_solver_clone
diff --git a/mlprec/impl/solver/mld_z_diag_solver_cnv.f90 b/mlprec/impl/solver/mld_z_diag_solver_cnv.f90
index 090dfee3..c22da047 100644
--- a/mlprec/impl/solver/mld_z_diag_solver_cnv.f90
+++ b/mlprec/impl/solver/mld_z_diag_solver_cnv.f90
@@ -71,11 +71,7 @@ subroutine mld_z_diag_solver_cnv(sv,info,amold,vmold,imold)
    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 mld_z_diag_solver_cnv
diff --git a/mlprec/impl/solver/mld_z_id_solver_apply.f90 b/mlprec/impl/solver/mld_z_id_solver_apply.f90
index a75497c3..b36acfaf 100644
--- a/mlprec/impl/solver/mld_z_id_solver_apply.f90
+++ b/mlprec/impl/solver/mld_z_id_solver_apply.f90
@@ -74,12 +74,8 @@ subroutine mld_z_id_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,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 mld_z_id_solver_apply
diff --git a/mlprec/impl/solver/mld_z_id_solver_apply_vect.f90 b/mlprec/impl/solver/mld_z_id_solver_apply_vect.f90
index f7b7f292..5921a94b 100644
--- a/mlprec/impl/solver/mld_z_id_solver_apply_vect.f90
+++ b/mlprec/impl/solver/mld_z_id_solver_apply_vect.f90
@@ -74,12 +74,8 @@ subroutine mld_z_id_solver_apply_vect(alpha,sv,x,beta,y,desc_data,trans,work,inf
   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 mld_z_id_solver_apply_vect
diff --git a/mlprec/impl/solver/mld_z_id_solver_clone.f90 b/mlprec/impl/solver/mld_z_id_solver_clone.f90
index e08a4b3e..a757e273 100644
--- a/mlprec/impl/solver/mld_z_id_solver_clone.f90
+++ b/mlprec/impl/solver/mld_z_id_solver_clone.f90
@@ -76,11 +76,7 @@ subroutine mld_z_id_solver_clone(sv,svout,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 mld_z_id_solver_clone
diff --git a/mlprec/impl/solver/mld_z_ilu_solver_apply.f90 b/mlprec/impl/solver/mld_z_ilu_solver_apply.f90
index 8ca1583f..9122a910 100644
--- a/mlprec/impl/solver/mld_z_ilu_solver_apply.f90
+++ b/mlprec/impl/solver/mld_z_ilu_solver_apply.f90
@@ -141,12 +141,8 @@ subroutine mld_z_ilu_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,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 mld_z_ilu_solver_apply
diff --git a/mlprec/impl/solver/mld_z_ilu_solver_apply_vect.f90 b/mlprec/impl/solver/mld_z_ilu_solver_apply_vect.f90
index a8bcd78d..0903c062 100644
--- a/mlprec/impl/solver/mld_z_ilu_solver_apply_vect.f90
+++ b/mlprec/impl/solver/mld_z_ilu_solver_apply_vect.f90
@@ -173,12 +173,8 @@ subroutine mld_z_ilu_solver_apply_vect(alpha,sv,x,beta,y,desc_data,trans,work,in
   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 mld_z_ilu_solver_apply_vect
diff --git a/mlprec/impl/solver/mld_z_ilu_solver_bld.f90 b/mlprec/impl/solver/mld_z_ilu_solver_bld.f90
index 5194d27e..5e0e7e32 100644
--- a/mlprec/impl/solver/mld_z_ilu_solver_bld.f90
+++ b/mlprec/impl/solver/mld_z_ilu_solver_bld.f90
@@ -207,11 +207,7 @@ subroutine mld_z_ilu_solver_bld(a,desc_a,sv,upd,info,b,amold,vmold,imold)
   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 mld_z_ilu_solver_bld
diff --git a/mlprec/impl/solver/mld_z_ilu_solver_clone.f90 b/mlprec/impl/solver/mld_z_ilu_solver_clone.f90
index a9ca370b..0609b028 100644
--- a/mlprec/impl/solver/mld_z_ilu_solver_clone.f90
+++ b/mlprec/impl/solver/mld_z_ilu_solver_clone.f90
@@ -86,11 +86,7 @@ subroutine mld_z_ilu_solver_clone(sv,svout,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 mld_z_ilu_solver_clone
diff --git a/mlprec/impl/solver/mld_z_ilu_solver_cnv.f90 b/mlprec/impl/solver/mld_z_ilu_solver_cnv.f90
index 8a351f43..391de691 100644
--- a/mlprec/impl/solver/mld_z_ilu_solver_cnv.f90
+++ b/mlprec/impl/solver/mld_z_ilu_solver_cnv.f90
@@ -71,11 +71,7 @@ subroutine mld_z_ilu_solver_cnv(sv,info,amold,vmold,imold)
   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 mld_z_ilu_solver_cnv
diff --git a/mlprec/mld_base_prec_type.F90 b/mlprec/mld_base_prec_type.F90
index b85daffc..8d978a84 100644
--- a/mlprec/mld_base_prec_type.F90
+++ b/mlprec/mld_base_prec_type.F90
@@ -1002,9 +1002,7 @@ contains
       info = psb_err_missing_override_method_
       call psb_errpush(info,name,i_err=ierr)
       call psb_get_erraction(err_act)
-      if (err_act /= psb_act_ret_) then
-        call psb_error()
-      end if
+      call psb_error_handler(err_act)
     end select
       
   end subroutine s_ml_parms_clone
@@ -1033,9 +1031,8 @@ contains
       info = psb_err_missing_override_method_
       call psb_errpush(info,name,i_err=ierr)
       call psb_get_erraction(err_act)
-      if (err_act /= psb_act_ret_) then
-        call psb_error()
-      end if
+      call psb_error_handler(err_act)
+      return
     end select
       
   end subroutine d_ml_parms_clone
diff --git a/mlprec/mld_c_base_smoother_mod.f90 b/mlprec/mld_c_base_smoother_mod.f90
index ec6f5958..6e5b50ac 100644
--- a/mlprec/mld_c_base_smoother_mod.f90
+++ b/mlprec/mld_c_base_smoother_mod.f90
@@ -56,7 +56,7 @@ module mld_c_base_smoother_mod
   use mld_c_base_solver_mod
   use psb_base_mod, only : psb_desc_type, psb_cspmat_type, psb_long_int_k_,&
        & psb_c_vect_type, psb_c_base_vect_type, psb_c_base_sparse_mat, &
-       & psb_spk_, psb_i_base_vect_type
+       & psb_spk_, psb_i_base_vect_type, psb_erractionsave, psb_error_handler
   
   !
   !
diff --git a/mlprec/mld_c_base_solver_mod.f90 b/mlprec/mld_c_base_solver_mod.f90
index 3623e9b6..c8c1bf73 100644
--- a/mlprec/mld_c_base_solver_mod.f90
+++ b/mlprec/mld_c_base_solver_mod.f90
@@ -56,7 +56,7 @@ module mld_c_base_solver_mod
   use mld_base_prec_type
   use psb_base_mod, only : psb_cspmat_type, &
        & psb_c_vect_type, psb_c_base_vect_type, psb_c_base_sparse_mat, &
-       & psb_i_base_vect_type, psb_erractionsave, psb_error_handler
+       & psb_spk_, psb_i_base_vect_type, psb_erractionsave, psb_error_handler
   !
   ! 
   ! Type: mld_T_base_solver_type.
diff --git a/mlprec/mld_c_onelev_mod.f90 b/mlprec/mld_c_onelev_mod.f90
index 167495d1..4e1ebba2 100644
--- a/mlprec/mld_c_onelev_mod.f90
+++ b/mlprec/mld_c_onelev_mod.f90
@@ -58,7 +58,8 @@ module mld_c_onelev_mod
   use mld_c_base_smoother_mod
   use psb_base_mod, only : psb_cspmat_type, psb_c_vect_type, &
        & psb_c_base_vect_type, psb_clinmap_type, psb_spk_, &
-       & psb_ipk_, psb_long_int_k_, psb_desc_type, psb_i_base_vect_type
+       & psb_ipk_, psb_long_int_k_, psb_desc_type, psb_i_base_vect_type, &
+       & psb_erractionsave, psb_error_handler
   !
   !
   ! Type: mld_Tonelev_type.
diff --git a/mlprec/mld_d_base_smoother_mod.f90 b/mlprec/mld_d_base_smoother_mod.f90
index b531aacf..20a55706 100644
--- a/mlprec/mld_d_base_smoother_mod.f90
+++ b/mlprec/mld_d_base_smoother_mod.f90
@@ -56,7 +56,7 @@ module mld_d_base_smoother_mod
   use mld_d_base_solver_mod
   use psb_base_mod, only : psb_desc_type, psb_dspmat_type, psb_long_int_k_,&
        & psb_d_vect_type, psb_d_base_vect_type, psb_d_base_sparse_mat, &
-       & psb_dpk_, psb_i_base_vect_type
+       & psb_dpk_, psb_i_base_vect_type, psb_erractionsave, psb_error_handler
   
   !
   !
diff --git a/mlprec/mld_d_base_solver_mod.f90 b/mlprec/mld_d_base_solver_mod.f90
index 6d901226..148bd2dd 100644
--- a/mlprec/mld_d_base_solver_mod.f90
+++ b/mlprec/mld_d_base_solver_mod.f90
@@ -56,7 +56,7 @@ module mld_d_base_solver_mod
   use mld_base_prec_type
   use psb_base_mod, only : psb_dspmat_type, &
        & psb_d_vect_type, psb_d_base_vect_type, psb_d_base_sparse_mat, &
-       & psb_i_base_vect_type, psb_erractionsave, psb_error_handler
+       & psb_dpk_, psb_i_base_vect_type, psb_erractionsave, psb_error_handler
   !
   ! 
   ! Type: mld_T_base_solver_type.
diff --git a/mlprec/mld_d_onelev_mod.f90 b/mlprec/mld_d_onelev_mod.f90
index b1ecae39..4c5ed294 100644
--- a/mlprec/mld_d_onelev_mod.f90
+++ b/mlprec/mld_d_onelev_mod.f90
@@ -58,7 +58,8 @@ module mld_d_onelev_mod
   use mld_d_base_smoother_mod
   use psb_base_mod, only : psb_dspmat_type, psb_d_vect_type, &
        & psb_d_base_vect_type, psb_dlinmap_type, psb_dpk_, &
-       & psb_ipk_, psb_long_int_k_, psb_desc_type, psb_i_base_vect_type
+       & psb_ipk_, psb_long_int_k_, psb_desc_type, psb_i_base_vect_type, &
+       & psb_erractionsave, psb_error_handler
   !
   !
   ! Type: mld_Tonelev_type.
diff --git a/mlprec/mld_s_base_smoother_mod.f90 b/mlprec/mld_s_base_smoother_mod.f90
index d5db07a3..5700584b 100644
--- a/mlprec/mld_s_base_smoother_mod.f90
+++ b/mlprec/mld_s_base_smoother_mod.f90
@@ -56,7 +56,7 @@ module mld_s_base_smoother_mod
   use mld_s_base_solver_mod
   use psb_base_mod, only : psb_desc_type, psb_sspmat_type, psb_long_int_k_,&
        & psb_s_vect_type, psb_s_base_vect_type, psb_s_base_sparse_mat, &
-       & psb_spk_, psb_i_base_vect_type
+       & psb_spk_, psb_i_base_vect_type, psb_erractionsave, psb_error_handler
   
   !
   !
diff --git a/mlprec/mld_s_base_solver_mod.f90 b/mlprec/mld_s_base_solver_mod.f90
index 48b9696c..7697e46e 100644
--- a/mlprec/mld_s_base_solver_mod.f90
+++ b/mlprec/mld_s_base_solver_mod.f90
@@ -56,7 +56,7 @@ module mld_s_base_solver_mod
   use mld_base_prec_type
   use psb_base_mod, only : psb_sspmat_type, &
        & psb_s_vect_type, psb_s_base_vect_type, psb_s_base_sparse_mat, &
-       & psb_i_base_vect_type, psb_erractionsave, psb_error_handler
+       & psb_spk_, psb_i_base_vect_type, psb_erractionsave, psb_error_handler
   !
   ! 
   ! Type: mld_T_base_solver_type.
diff --git a/mlprec/mld_s_ilu_impl.f90 b/mlprec/mld_s_ilu_impl.f90
deleted file mode 100644
index db2d16ec..00000000
--- a/mlprec/mld_s_ilu_impl.f90
+++ /dev/null
@@ -1,472 +0,0 @@
-!!$
-!!$ 
-!!$                           MLD2P4  version 2.0
-!!$  MultiLevel Domain Decomposition Parallel Preconditioners Package
-!!$             based on PSBLAS (Parallel Sparse BLAS version 3.0)
-!!$  
-!!$  (C) Copyright 2008,2009,2010,2012,2013
-!!$
-!!$                      Salvatore Filippone  University of Rome Tor Vergata
-!!$                      Alfredo Buttari      CNRS-IRIT, Toulouse
-!!$                      Pasqua D'Ambra       ICAR-CNR, Naples
-!!$                      Daniela di Serafino  Second University of Naples
-!!$ 
-!!$  Redistribution and use in source and binary forms, with or without
-!!$  modification, are permitted provided that the following conditions
-!!$  are met:
-!!$    1. Redistributions of source code must retain the above copyright
-!!$       notice, this list of conditions and the following disclaimer.
-!!$    2. Redistributions in binary form must reproduce the above copyright
-!!$       notice, this list of conditions, and the following disclaimer in the
-!!$       documentation and/or other materials provided with the distribution.
-!!$    3. The name of the MLD2P4 group or the names of its contributors may
-!!$       not be used to endorse or promote products derived from this
-!!$       software without specific written permission.
-!!$ 
-!!$  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-!!$  ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-!!$  TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-!!$  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE MLD2P4 GROUP OR ITS CONTRIBUTORS
-!!$  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-!!$  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-!!$  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-!!$  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-!!$  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-!!$  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-!!$  POSSIBILITY OF SUCH DAMAGE.
-!!$ 
-!!$
-!
-!
-!
-!
-!
-!
-
-
-subroutine mld_s_ilu_solver_apply_vect(alpha,sv,x,beta,y,desc_data,trans,work,info)
-  use psb_base_mod
-  use mld_s_ilu_solver, mld_protect_name => mld_s_ilu_solver_apply_vect
-  implicit none 
-  type(psb_desc_type), intent(in)             :: desc_data
-  class(mld_s_ilu_solver_type), intent(inout) :: sv
-  type(psb_s_vect_type),intent(inout)         :: x
-  type(psb_s_vect_type),intent(inout)         :: y
-  real(psb_spk_),intent(in)                   :: alpha,beta
-  character(len=1),intent(in)                 :: trans
-  real(psb_spk_),target, intent(inout)        :: work(:)
-  integer, intent(out)                        :: info
-
-  integer    :: n_row,n_col
-  type(psb_s_vect_type) :: wv
-  real(psb_spk_), pointer :: ww(:), aux(:), tx(:),ty(:)
-  integer    :: ictxt,np,me,i, err_act
-  character          :: trans_
-  character(len=20)  :: name='s_ilu_solver_apply'
-
-  call psb_erractionsave(err_act)
-
-  info = psb_success_
-
-  trans_ = psb_toupper(trans)
-  select case(trans_)
-  case('N')
-  case('T')
-  case('C')
-  case default
-    call psb_errpush(psb_err_iarg_invalid_i_,name)
-    goto 9999
-  end select
-
-  n_row = desc_data%get_local_rows()
-  n_col = desc_data%get_local_cols()
-
-
-  if (x%get_nrows() < n_row) then 
-    info = 36
-    call psb_errpush(info,name,i_err=(/2,n_row,0,0,0/))
-    goto 9999
-  end if
-  if (y%get_nrows() < n_row) then 
-    info = 36
-    call psb_errpush(info,name,i_err=(/3,n_row,0,0,0/))
-    goto 9999
-  end if
-  if (sv%dv%get_nrows() < n_row) then
-    info = 1124
-    call psb_errpush(info,name,a_err="preconditioner: DV")
-    goto 9999
-  end if
-
-
-
-  if (n_col <= size(work)) then 
-    ww => work(1:n_col)
-    if ((4*n_col+n_col) <= size(work)) then 
-      aux => work(n_col+1:)
-    else
-      allocate(aux(4*n_col),stat=info)
-    endif
-  else
-    allocate(ww(n_col),aux(4*n_col),stat=info)
-  endif
-
-  call wv%bld(n_col,mold=x%v)
-
-  if (info /= psb_success_) then 
-    info=psb_err_alloc_request_
-    call psb_errpush(info,name,i_err=(/5*n_col,0,0,0,0/),&
-         & a_err='real(psb_spk_)')
-    goto 9999      
-  end if
-
-
-
-  select case(trans_)
-  case('N')
-    call psb_spsm(sone,sv%l,x,szero,wv,desc_data,info,&
-         & trans=trans_,scale='L',diag=sv%dv,choice=psb_none_,work=aux)
-
-    if (info == psb_success_) call psb_spsm(alpha,sv%u,wv,beta,y,desc_data,info,&
-         & trans=trans_,scale='U',choice=psb_none_, work=aux)
-
-  case('T')
-    call psb_spsm(sone,sv%u,x,szero,wv,desc_data,info,&
-         & trans=trans_,scale='L',diag=sv%dv,choice=psb_none_,work=aux)
-    if (info == psb_success_) call psb_spsm(alpha,sv%l,wv,beta,y,desc_data,info,&
-         & trans=trans_,scale='U',choice=psb_none_,work=aux)
-
-  case('C')
-    ! For real this is the same of T but in the future we will move to
-    ! a preprocessed version, so we need a placeholder
-    call psb_spsm(sone,sv%u,x,szero,wv,desc_data,info,&
-         & trans=trans_,scale='L',diag=sv%dv,choice=psb_none_,work=aux)
-    if (info == psb_success_) call psb_spsm(alpha,sv%l,wv,beta,y,desc_data,info,&
-         & trans=trans_,scale='U',choice=psb_none_,work=aux)
-
-  case default
-    call psb_errpush(psb_err_internal_error_,name,a_err='Invalid TRANS in ILU subsolve')
-    goto 9999
-  end select
-
-
-  if (info /= psb_success_) then
-
-    call psb_errpush(psb_err_internal_error_,name,a_err='Error in subsolve')
-    goto 9999
-  endif
-  call wv%free(info)
-  if (n_col <= size(work)) then 
-    if ((4*n_col+n_col) <= size(work)) then 
-    else
-      deallocate(aux)
-    endif
-  else
-    deallocate(ww,aux)
-  endif
-
-  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
-  return
-
-end subroutine mld_s_ilu_solver_apply_vect
-
-
-subroutine mld_s_ilu_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,info)
-  use psb_base_mod
-  use mld_s_ilu_solver, mld_protect_name => mld_s_ilu_solver_apply
-  implicit none 
-  type(psb_desc_type), intent(in)      :: desc_data
-  class(mld_s_ilu_solver_type), intent(in) :: sv
-  real(psb_spk_),intent(inout)         :: x(:)
-  real(psb_spk_),intent(inout)         :: y(:)
-  real(psb_spk_),intent(in)            :: alpha,beta
-  character(len=1),intent(in)          :: trans
-  real(psb_spk_),target, intent(inout) :: work(:)
-  integer, intent(out)                 :: info
-
-  integer    :: n_row,n_col
-  real(psb_spk_), pointer :: ww(:), aux(:), tx(:),ty(:)
-  integer    :: ictxt,np,me,i, err_act
-  character          :: trans_
-  character(len=20)  :: name='s_ilu_solver_apply'
-
-  call psb_erractionsave(err_act)
-
-  info = psb_success_
-
-  trans_ = psb_toupper(trans)
-  select case(trans_)
-  case('N')
-  case('T','C')
-  case default
-    call psb_errpush(psb_err_iarg_invalid_i_,name)
-    goto 9999
-  end select
-
-  n_row = desc_data%get_local_rows()
-  n_col = desc_data%get_local_cols()
-
-  if (n_col <= size(work)) then 
-    ww => work(1:n_col)
-    if ((4*n_col+n_col) <= size(work)) then 
-      aux => work(n_col+1:)
-    else
-      allocate(aux(4*n_col),stat=info)
-      if (info /= psb_success_) then 
-        info=psb_err_alloc_request_
-        call psb_errpush(info,name,i_err=(/4*n_col,0,0,0,0/),&
-             & a_err='real(psb_spk_)')
-        goto 9999      
-      end if
-    endif
-  else
-    allocate(ww(n_col),aux(4*n_col),stat=info)
-    if (info /= psb_success_) then 
-      info=psb_err_alloc_request_
-      call psb_errpush(info,name,i_err=(/5*n_col,0,0,0,0/),&
-           & a_err='real(psb_spk_)')
-      goto 9999      
-    end if
-  endif
-
-  select case(trans_)
-  case('N')
-    call psb_spsm(sone,sv%l,x,szero,ww,desc_data,info,&
-         & trans=trans_,scale='L',diag=sv%d,choice=psb_none_,work=aux)
-
-    if (info == psb_success_) call psb_spsm(alpha,sv%u,ww,beta,y,desc_data,info,&
-         & trans=trans_,scale='U',choice=psb_none_, work=aux)
-
-  case('T')
-    call psb_spsm(sone,sv%u,x,szero,ww,desc_data,info,&
-         & trans=trans_,scale='L',diag=sv%d,choice=psb_none_,work=aux)
-    if (info == psb_success_) call psb_spsm(alpha,sv%l,ww,beta,y,desc_data,info,&
-         & trans=trans_,scale='U',choice=psb_none_,work=aux)
-  case('C')
-    ! For real this is the same of T but in the future we will move to
-    ! a preprocessed version, so we need a placeholder
-    call psb_spsm(sone,sv%u,x,szero,ww,desc_data,info,&
-         & trans=trans_,scale='L',diag=sv%d,choice=psb_none_,work=aux)
-    if (info == psb_success_) call psb_spsm(alpha,sv%l,ww,beta,y,desc_data,info,&
-         & trans=trans_,scale='U',choice=psb_none_,work=aux)
-  case default
-    call psb_errpush(psb_err_internal_error_,name,a_err='Invalid TRANS in ILU subsolve')
-    goto 9999
-  end select
-
-
-  if (info /= psb_success_) then
-
-    call psb_errpush(psb_err_internal_error_,name,a_err='Error in subsolve')
-    goto 9999
-  endif
-
-  if (n_col <= size(work)) then 
-    if ((4*n_col+n_col) <= size(work)) then 
-    else
-      deallocate(aux)
-    endif
-  else
-    deallocate(ww,aux)
-  endif
-
-  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
-  return
-
-end subroutine mld_s_ilu_solver_apply
-
-subroutine mld_s_ilu_solver_bld(a,desc_a,sv,upd,info,b,amold,vmold)
-
-  use psb_base_mod
-  use mld_s_ilu_solver, mld_protect_name => mld_s_ilu_solver_bld
-
-  Implicit None
-
-  ! Arguments
-  type(psb_sspmat_type), intent(in), target           :: a
-  Type(psb_desc_type), Intent(in)                     :: desc_a 
-  class(mld_s_ilu_solver_type), intent(inout)         :: sv
-  character, intent(in)                               :: upd
-  integer, intent(out)                                :: info
-  type(psb_sspmat_type), intent(in), target, optional :: b
-  class(psb_s_base_sparse_mat), intent(in), optional  :: amold
-  class(psb_s_base_vect_type), intent(in), optional   :: vmold
-  ! Local variables
-  integer :: n_row,n_col, nrow_a, nztota
-  real(psb_spk_), pointer :: ww(:), aux(:), tx(:),ty(:)
-  integer :: ictxt,np,me,i, err_act, debug_unit, debug_level
-  character(len=20)  :: name='s_ilu_solver_bld', ch_err
-
-  info=psb_success_
-  call psb_erractionsave(err_act)
-  debug_unit  = psb_get_debug_unit()
-  debug_level = psb_get_debug_level()
-  ictxt       = desc_a%get_context()
-  call psb_info(ictxt, me, np)
-  if (debug_level >= psb_debug_outer_) &
-       & write(debug_unit,*) me,' ',trim(name),' start'
-
-
-  n_row  = desc_a%get_local_rows()
-
-  if (psb_toupper(upd) == 'F') then 
-    nrow_a = a%get_nrows()
-    nztota = a%get_nzeros()
-    if (present(b)) then 
-      nztota = nztota + b%get_nzeros()
-    end if
-
-    call sv%l%csall(n_row,n_row,info,nztota)
-    if (info == psb_success_) call sv%u%csall(n_row,n_row,info,nztota)
-    if(info /= psb_success_) then
-      info=psb_err_from_subroutine_
-      ch_err='psb_sp_all'
-      call psb_errpush(info,name,a_err=ch_err)
-      goto 9999
-    end if
-
-    if (allocated(sv%d)) then 
-      if (size(sv%d) < n_row) then 
-        deallocate(sv%d)
-      endif
-    endif
-    if (.not.allocated(sv%d))  allocate(sv%d(n_row),stat=info)
-
-    if (info /= psb_success_) then 
-      call psb_errpush(psb_err_from_subroutine_,name,a_err='Allocate')
-      goto 9999      
-    endif
-
-
-    select case(sv%fact_type)
-
-    case (mld_ilu_t_)
-      !
-      ! ILU(k,t)
-      !
-      select case(sv%fill_in)
-
-      case(:-1) 
-        ! Error: fill-in <= -1
-        call psb_errpush(psb_err_input_value_invalid_i_,&
-             & name,i_err=(/3,sv%fill_in,0,0,0/))
-        goto 9999
-
-      case(0:)
-        ! Fill-in >= 0
-        call mld_ilut_fact(sv%fill_in,sv%thresh,&
-             & a, sv%l,sv%u,sv%d,info,blck=b)
-      end select
-      if(info /= psb_success_) then
-        info=psb_err_from_subroutine_
-        ch_err='mld_ilut_fact'
-        call psb_errpush(info,name,a_err=ch_err)
-        goto 9999
-      end if
-
-    case(mld_ilu_n_,mld_milu_n_) 
-      !
-      ! ILU(k) and MILU(k)
-      !
-      select case(sv%fill_in)
-      case(:-1) 
-        ! Error: fill-in <= -1
-        call psb_errpush(psb_err_input_value_invalid_i_,&
-             & name,i_err=(/3,sv%fill_in,0,0,0/))
-        goto 9999
-      case(0)
-        ! Fill-in 0
-        ! Separate implementation of ILU(0) for better performance.
-        ! There seems to be a problem with the separate implementation of MILU(0),
-        ! contained into mld_ilu0_fact. This must be investigated. For the time being,
-        ! resort to the implementation of MILU(k) with k=0.
-        if (sv%fact_type == mld_ilu_n_) then 
-          call mld_ilu0_fact(sv%fact_type,a,sv%l,sv%u,&
-               & sv%d,info,blck=b,upd=upd)
-        else
-          call mld_iluk_fact(sv%fill_in,sv%fact_type,&
-               & a,sv%l,sv%u,sv%d,info,blck=b)
-        endif
-      case(1:)
-        ! Fill-in >= 1
-        ! The same routine implements both ILU(k) and MILU(k)
-        call mld_iluk_fact(sv%fill_in,sv%fact_type,&
-             & a,sv%l,sv%u,sv%d,info,blck=b)
-      end select
-      if (info /= psb_success_) then
-        info=psb_err_from_subroutine_
-        ch_err='mld_iluk_fact'
-        call psb_errpush(info,name,a_err=ch_err)
-        goto 9999
-      end if
-
-    case default
-      ! If we end up here, something was wrong up in the call chain. 
-      info = psb_err_input_value_invalid_i_
-      call psb_errpush(psb_err_input_value_invalid_i_,name,&
-           & i_err=(/3,sv%fact_type,0,0,0/))
-      goto 9999
-
-    end select
-  else
-    ! Here we should add checks for reuse of L and U.
-    ! For the time being just throw an error. 
-    info = 31
-    call psb_errpush(info, name,&
-         & i_err=(/3,0,0,0,0/),a_err=upd)
-    goto 9999 
-
-    !
-    ! What is an update of a factorization??
-    ! A first attempt could be to reuse EXACTLY the existing indices
-    ! as if it was an ILU(0) (since, effectively, the sparsity pattern
-    ! should not grow beyond what is already there).
-    !  
-    call mld_ilu0_fact(sv%fact_type,a,&
-         & sv%l,sv%u,&
-         & sv%d,info,blck=b,upd=upd)
-
-  end if
-
-  call sv%l%set_asb()
-  call sv%l%trim()
-  call sv%u%set_asb()
-  call sv%u%trim()
-  call sv%dv%bld(sv%d,mold=vmold)
-
-  if (present(amold)) then 
-    call sv%l%cscnv(info,mold=amold)
-    call sv%u%cscnv(info,mold=amold)
-  end if
-
-  if (debug_level >= psb_debug_outer_) &
-       & write(debug_unit,*) me,' ',trim(name),' end'
-
-  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
-  return
-end subroutine mld_s_ilu_solver_bld
-
diff --git a/mlprec/mld_s_onelev_mod.f90 b/mlprec/mld_s_onelev_mod.f90
index ef2dfa72..cc942129 100644
--- a/mlprec/mld_s_onelev_mod.f90
+++ b/mlprec/mld_s_onelev_mod.f90
@@ -58,7 +58,8 @@ module mld_s_onelev_mod
   use mld_s_base_smoother_mod
   use psb_base_mod, only : psb_sspmat_type, psb_s_vect_type, &
        & psb_s_base_vect_type, psb_slinmap_type, psb_spk_, &
-       & psb_ipk_, psb_long_int_k_, psb_desc_type, psb_i_base_vect_type
+       & psb_ipk_, psb_long_int_k_, psb_desc_type, psb_i_base_vect_type, &
+       & psb_erractionsave, psb_error_handler
   !
   !
   ! Type: mld_Tonelev_type.
diff --git a/mlprec/mld_z_base_smoother_mod.f90 b/mlprec/mld_z_base_smoother_mod.f90
index 554f002c..780f378f 100644
--- a/mlprec/mld_z_base_smoother_mod.f90
+++ b/mlprec/mld_z_base_smoother_mod.f90
@@ -56,7 +56,7 @@ module mld_z_base_smoother_mod
   use mld_z_base_solver_mod
   use psb_base_mod, only : psb_desc_type, psb_zspmat_type, psb_long_int_k_,&
        & psb_z_vect_type, psb_z_base_vect_type, psb_z_base_sparse_mat, &
-       & psb_dpk_, psb_i_base_vect_type
+       & psb_dpk_, psb_i_base_vect_type, psb_erractionsave, psb_error_handler
   
   !
   !
diff --git a/mlprec/mld_z_base_solver_mod.f90 b/mlprec/mld_z_base_solver_mod.f90
index 815414d7..749063a7 100644
--- a/mlprec/mld_z_base_solver_mod.f90
+++ b/mlprec/mld_z_base_solver_mod.f90
@@ -56,7 +56,7 @@ module mld_z_base_solver_mod
   use mld_base_prec_type
   use psb_base_mod, only : psb_zspmat_type, &
        & psb_z_vect_type, psb_z_base_vect_type, psb_z_base_sparse_mat, &
-       & psb_i_base_vect_type, psb_erractionsave, psb_error_handler
+       & psb_dpk_, psb_i_base_vect_type, psb_erractionsave, psb_error_handler
   !
   ! 
   ! Type: mld_T_base_solver_type.
diff --git a/mlprec/mld_z_onelev_mod.f90 b/mlprec/mld_z_onelev_mod.f90
index ca866e2a..589f1f2a 100644
--- a/mlprec/mld_z_onelev_mod.f90
+++ b/mlprec/mld_z_onelev_mod.f90
@@ -58,7 +58,8 @@ module mld_z_onelev_mod
   use mld_z_base_smoother_mod
   use psb_base_mod, only : psb_zspmat_type, psb_z_vect_type, &
        & psb_z_base_vect_type, psb_zlinmap_type, psb_dpk_, &
-       & psb_ipk_, psb_long_int_k_, psb_desc_type, psb_i_base_vect_type
+       & psb_ipk_, psb_long_int_k_, psb_desc_type, psb_i_base_vect_type, &
+       & psb_erractionsave, psb_error_handler
   !
   !
   ! Type: mld_Tonelev_type.
diff --git a/tests/fileread/cf_sample.f90 b/tests/fileread/cf_sample.f90
index 116bc630..ff1eefc3 100644
--- a/tests/fileread/cf_sample.f90
+++ b/tests/fileread/cf_sample.f90
@@ -366,14 +366,12 @@ program cf_sample
   call psb_spfree(a, desc_a,info)
   call mld_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 continue
+  call psb_error(ictxt)
+
 contains
   !
   ! get iteration parameters from standard input
diff --git a/tests/fileread/df_sample.f90 b/tests/fileread/df_sample.f90
index 4322bd45..3396afdf 100644
--- a/tests/fileread/df_sample.f90
+++ b/tests/fileread/df_sample.f90
@@ -369,13 +369,13 @@ program df_sample
   call mld_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 continue
+  call psb_error(ictxt)
+
+
 contains
   !
   ! get iteration parameters from standard input
diff --git a/tests/fileread/sf_sample.f90 b/tests/fileread/sf_sample.f90
index 1687179a..75981167 100644
--- a/tests/fileread/sf_sample.f90
+++ b/tests/fileread/sf_sample.f90
@@ -367,13 +367,12 @@ program sf_sample
   call mld_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 continue
+  call psb_error(ictxt)
+
 contains
   !
   ! get iteration parameters from standard input
diff --git a/tests/fileread/zf_sample.f90 b/tests/fileread/zf_sample.f90
index 2908058d..663cad60 100644
--- a/tests/fileread/zf_sample.f90
+++ b/tests/fileread/zf_sample.f90
@@ -366,14 +366,12 @@ program zf_sample
   call psb_spfree(a, desc_a,info)
   call mld_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 continue
+  call psb_error(ictxt)
+
 contains
   !
   ! get iteration parameters from standard input
diff --git a/tests/newslv/mld_d_tlu_solver.f90 b/tests/newslv/mld_d_tlu_solver.f90
index de7fa870..a0a2627d 100644
--- a/tests/newslv/mld_d_tlu_solver.f90
+++ b/tests/newslv/mld_d_tlu_solver.f90
@@ -191,13 +191,9 @@ contains
     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
-    return
+9999 call psb_error_handler(err_act)
+
+  return
   end subroutine d_tlu_solver_check
 
 
@@ -229,13 +225,9 @@ contains
     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
-    return
+9999 call psb_error_handler(err_act)
+
+  return
   end subroutine d_tlu_solver_seti
 
   subroutine d_tlu_solver_setc(sv,what,val,info)
@@ -264,13 +256,9 @@ contains
     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
-    return
+9999 call psb_error_handler(err_act)
+
+  return
   end subroutine d_tlu_solver_setc
   
   subroutine d_tlu_solver_setr(sv,what,val,info)
@@ -300,13 +288,9 @@ contains
     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
-    return
+9999 call psb_error_handler(err_act)
+
+  return
   end subroutine d_tlu_solver_setr
 
   subroutine d_tlu_solver_free(sv,info)
@@ -337,13 +321,9 @@ contains
     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
-    return
+9999 call psb_error_handler(err_act)
+
+  return
   end subroutine d_tlu_solver_free
 
   subroutine d_tlu_solver_descr(sv,info,iout,coarse)
@@ -385,13 +365,9 @@ contains
     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
-    return
+9999 call psb_error_handler(err_act)
+
+  return
   end subroutine d_tlu_solver_descr
 
   function d_tlu_solver_get_nzeros(sv) result(val)
diff --git a/tests/newslv/mld_d_tlu_solver_impl.f90 b/tests/newslv/mld_d_tlu_solver_impl.f90
index 3a2d976c..dcef95ad 100644
--- a/tests/newslv/mld_d_tlu_solver_impl.f90
+++ b/tests/newslv/mld_d_tlu_solver_impl.f90
@@ -173,12 +173,8 @@ subroutine mld_d_tlu_solver_apply_vect(alpha,sv,x,beta,y,desc_data,trans,work,in
   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 mld_d_tlu_solver_apply_vect
@@ -284,12 +280,8 @@ subroutine mld_d_tlu_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,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 mld_d_tlu_solver_apply
@@ -464,12 +456,8 @@ subroutine mld_d_tlu_solver_bld(a,desc_a,sv,upd,info,b,amold,vmold)
   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 mld_d_tlu_solver_bld
 
diff --git a/tests/newslv/ppde3d.f90 b/tests/newslv/ppde3d.f90
index b633e0b7..d1c15e7d 100644
--- a/tests/newslv/ppde3d.f90
+++ b/tests/newslv/ppde3d.f90
@@ -352,14 +352,12 @@ program ppde3d
     call psb_errpush(info,name,a_err=ch_err)
     goto 9999
   end if
-
-9999 continue
-  if(info /= psb_success_) then
-    call psb_error(ictxt)
-  end if
   call psb_exit(ictxt)
   stop
 
+9999 continue
+  call psb_error(ictxt)
+
 contains
   !
   ! get iteration parameters from standard input
diff --git a/tests/pdegen/ppde2d.f90 b/tests/pdegen/ppde2d.f90
index 1d1a40de..33374c3e 100644
--- a/tests/pdegen/ppde2d.f90
+++ b/tests/pdegen/ppde2d.f90
@@ -334,14 +334,12 @@ program ppde2d
     call psb_errpush(info,name,a_err=ch_err)
     goto 9999
   end if
-
-9999 continue
-  if(info /= psb_success_) then
-    call psb_error(ictxt)
-  end if
   call psb_exit(ictxt)
   stop
 
+9999 continue
+  call psb_error(ictxt)
+
 contains
   !
   ! get iteration parameters from standard input
diff --git a/tests/pdegen/ppde3d.f90 b/tests/pdegen/ppde3d.f90
index 787cebb6..3689c45d 100644
--- a/tests/pdegen/ppde3d.f90
+++ b/tests/pdegen/ppde3d.f90
@@ -348,14 +348,12 @@ program ppde3d
     call psb_errpush(info,name,a_err=ch_err)
     goto 9999
   end if
-
-9999 continue
-  if(info /= psb_success_) then
-    call psb_error(ictxt)
-  end if
   call psb_exit(ictxt)
   stop
 
+9999 continue
+  call psb_error(ictxt)
+
 contains
   !
   ! get iteration parameters from standard input
diff --git a/tests/pdegen/spde2d.f90 b/tests/pdegen/spde2d.f90
index c2af3a16..d5fd9ffb 100644
--- a/tests/pdegen/spde2d.f90
+++ b/tests/pdegen/spde2d.f90
@@ -333,14 +333,12 @@ program spde2d
     call psb_errpush(info,name,a_err=ch_err)
     goto 9999
   end if
-
-9999 continue
-  if(info /= psb_success_) then
-    call psb_error(ictxt)
-  end if
   call psb_exit(ictxt)
   stop
 
+9999 continue
+  call psb_error(ictxt)
+
 contains
   !
   ! get iteration parameters from standard input
diff --git a/tests/pdegen/spde3d.f90 b/tests/pdegen/spde3d.f90
index 518c79d4..1b2f60c2 100644
--- a/tests/pdegen/spde3d.f90
+++ b/tests/pdegen/spde3d.f90
@@ -348,14 +348,12 @@ program spde3d
     call psb_errpush(info,name,a_err=ch_err)
     goto 9999
   end if
-
-9999 continue
-  if(info /= psb_success_) then
-    call psb_error(ictxt)
-  end if
   call psb_exit(ictxt)
   stop
 
+9999 continue
+  call psb_error(ictxt)
+
 contains
   !
   ! get iteration parameters from standard input