diff --git a/base/serial/psb_cnumbmm.f90 b/base/serial/psb_cnumbmm.f90
index 0bfa7e34..3de7e571 100644
--- a/base/serial/psb_cnumbmm.f90
+++ b/base/serial/psb_cnumbmm.f90
@@ -73,12 +73,8 @@ subroutine psb_cnumbmm(a,b,c)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act == psb_act_abort_) then
-     call psb_error()
-     return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine psb_cnumbmm
@@ -146,12 +142,8 @@ subroutine psb_cbase_numbmm(a,b,c)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act == psb_act_abort_) then
-     call psb_error()
-     return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 contains 
diff --git a/base/serial/psb_cspspmm.f90 b/base/serial/psb_cspspmm.f90
index 8d39ea72..9b537320 100644
--- a/base/serial/psb_cspspmm.f90
+++ b/base/serial/psb_cspspmm.f90
@@ -109,12 +109,8 @@ subroutine psb_cspspmm(a,b,c,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act == psb_act_abort_) then
-     call psb_error()
-     return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine psb_cspspmm
diff --git a/base/serial/psb_csymbmm.f90 b/base/serial/psb_csymbmm.f90
index 85df14eb..17712077 100644
--- a/base/serial/psb_csymbmm.f90
+++ b/base/serial/psb_csymbmm.f90
@@ -75,12 +75,8 @@ subroutine psb_csymbmm(a,b,c,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act == psb_act_abort_) then
-     call psb_error()
-     return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine psb_csymbmm
@@ -143,12 +139,8 @@ subroutine psb_cbase_symbmm(a,b,c,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act == psb_act_abort_) then
-     call psb_error()
-     return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 contains
diff --git a/base/serial/psb_dnumbmm.f90 b/base/serial/psb_dnumbmm.f90
index 22117398..1924acda 100644
--- a/base/serial/psb_dnumbmm.f90
+++ b/base/serial/psb_dnumbmm.f90
@@ -73,12 +73,8 @@ subroutine psb_dnumbmm(a,b,c)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act == psb_act_abort_) then
-     call psb_error()
-     return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine psb_dnumbmm
@@ -146,12 +142,8 @@ subroutine psb_dbase_numbmm(a,b,c)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act == psb_act_abort_) then
-     call psb_error()
-     return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 contains 
diff --git a/base/serial/psb_dspspmm.f90 b/base/serial/psb_dspspmm.f90
index 251a2d2d..a8963d48 100644
--- a/base/serial/psb_dspspmm.f90
+++ b/base/serial/psb_dspspmm.f90
@@ -109,12 +109,8 @@ subroutine psb_dspspmm(a,b,c,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act == psb_act_abort_) then
-     call psb_error()
-     return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine psb_dspspmm
diff --git a/base/serial/psb_dsymbmm.f90 b/base/serial/psb_dsymbmm.f90
index 626ece11..7733077b 100644
--- a/base/serial/psb_dsymbmm.f90
+++ b/base/serial/psb_dsymbmm.f90
@@ -75,12 +75,8 @@ subroutine psb_dsymbmm(a,b,c,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act == psb_act_abort_) then
-     call psb_error()
-     return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine psb_dsymbmm
@@ -143,12 +139,8 @@ subroutine psb_dbase_symbmm(a,b,c,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act == psb_act_abort_) then
-     call psb_error()
-     return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 contains
diff --git a/base/serial/psb_snumbmm.f90 b/base/serial/psb_snumbmm.f90
index 311c1b07..21a0af4e 100644
--- a/base/serial/psb_snumbmm.f90
+++ b/base/serial/psb_snumbmm.f90
@@ -73,12 +73,8 @@ subroutine psb_snumbmm(a,b,c)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act == psb_act_abort_) then
-     call psb_error()
-     return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine psb_snumbmm
@@ -146,12 +142,8 @@ subroutine psb_sbase_numbmm(a,b,c)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act == psb_act_abort_) then
-     call psb_error()
-     return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 contains 
diff --git a/base/serial/psb_sspspmm.f90 b/base/serial/psb_sspspmm.f90
index 9c31bc17..98552c70 100644
--- a/base/serial/psb_sspspmm.f90
+++ b/base/serial/psb_sspspmm.f90
@@ -109,12 +109,8 @@ subroutine psb_sspspmm(a,b,c,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act == psb_act_abort_) then
-     call psb_error()
-     return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine psb_sspspmm
diff --git a/base/serial/psb_ssymbmm.f90 b/base/serial/psb_ssymbmm.f90
index 1b47a5bf..bc84c008 100644
--- a/base/serial/psb_ssymbmm.f90
+++ b/base/serial/psb_ssymbmm.f90
@@ -75,12 +75,8 @@ subroutine psb_ssymbmm(a,b,c,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act == psb_act_abort_) then
-     call psb_error()
-     return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine psb_ssymbmm
@@ -143,12 +139,8 @@ subroutine psb_sbase_symbmm(a,b,c,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act == psb_act_abort_) then
-     call psb_error()
-     return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 contains
diff --git a/base/serial/psb_znumbmm.f90 b/base/serial/psb_znumbmm.f90
index 7dad5adf..ebc64f3b 100644
--- a/base/serial/psb_znumbmm.f90
+++ b/base/serial/psb_znumbmm.f90
@@ -73,12 +73,8 @@ subroutine psb_znumbmm(a,b,c)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act == psb_act_abort_) then
-     call psb_error()
-     return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine psb_znumbmm
@@ -146,12 +142,8 @@ subroutine psb_zbase_numbmm(a,b,c)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act == psb_act_abort_) then
-     call psb_error()
-     return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 contains 
diff --git a/base/serial/psb_zspspmm.f90 b/base/serial/psb_zspspmm.f90
index 7b7fd1a1..706dea61 100644
--- a/base/serial/psb_zspspmm.f90
+++ b/base/serial/psb_zspspmm.f90
@@ -109,12 +109,8 @@ subroutine psb_zspspmm(a,b,c,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act == psb_act_abort_) then
-     call psb_error()
-     return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine psb_zspspmm
diff --git a/base/serial/psb_zsymbmm.f90 b/base/serial/psb_zsymbmm.f90
index 3799d0cc..6ae462cf 100644
--- a/base/serial/psb_zsymbmm.f90
+++ b/base/serial/psb_zsymbmm.f90
@@ -75,12 +75,8 @@ subroutine psb_zsymbmm(a,b,c,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act == psb_act_abort_) then
-     call psb_error()
-     return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 end subroutine psb_zsymbmm
@@ -143,12 +139,8 @@ subroutine psb_zbase_symbmm(a,b,c,info)
   call psb_erractionrestore(err_act)
   return
 
-9999 continue
-  call psb_erractionrestore(err_act)
-  if (err_act == psb_act_abort_) then
-     call psb_error()
-     return
-  end if
+9999 call psb_error_handler(err_act)
+
   return
 
 contains