diff --git a/base/psblas/psb_cnrm2.f90 b/base/psblas/psb_cnrm2.f90
index 2e6c5994..02775037 100644
--- a/base/psblas/psb_cnrm2.f90
+++ b/base/psblas/psb_cnrm2.f90
@@ -302,11 +302,11 @@ function psb_cnrm2_vect(x, desc_a, info,global)  result(res)
   character(len=20)      :: name, ch_err
 
   name='psb_cnrm2v'
+  call psb_erractionsave(err_act)
   if  (psb_errstatus_fatal()) then
     info = psb_err_internal_error_ ;    goto 9999
   end if
   info=psb_success_
-  call psb_erractionsave(err_act)
 
   ctxt=desc_a%get_context()
 
@@ -411,11 +411,11 @@ function psb_cnrm2_weight_vect(x,w, desc_a, info,global,aux)  result(res)
   character(len=20)      :: name, ch_err
 
   name='psb_cnrm2v_weight'
+  call psb_erractionsave(err_act)
   if  (psb_errstatus_fatal()) then
     info = psb_err_internal_error_ ;    goto 9999
   end if
   info=psb_success_
-  call psb_erractionsave(err_act)
 
   ctxt=desc_a%get_context()
 
@@ -523,11 +523,11 @@ function psb_cnrm2_weightmask_vect(x,w,idv, desc_a, info,global, aux)  result(re
   character(len=20)      :: name, ch_err
 
   name='psb_cnrm2v_weightmask'
+  call psb_erractionsave(err_act)
   if  (psb_errstatus_fatal()) then
     info = psb_err_internal_error_ ;    goto 9999
   end if
   info=psb_success_
-  call psb_erractionsave(err_act)
 
   ctxt=desc_a%get_context()
 
diff --git a/base/psblas/psb_dnrm2.f90 b/base/psblas/psb_dnrm2.f90
index 993c9662..6985bcb4 100644
--- a/base/psblas/psb_dnrm2.f90
+++ b/base/psblas/psb_dnrm2.f90
@@ -302,11 +302,11 @@ function psb_dnrm2_vect(x, desc_a, info,global)  result(res)
   character(len=20)      :: name, ch_err
 
   name='psb_dnrm2v'
+  call psb_erractionsave(err_act)
   if  (psb_errstatus_fatal()) then
     info = psb_err_internal_error_ ;    goto 9999
   end if
   info=psb_success_
-  call psb_erractionsave(err_act)
 
   ctxt=desc_a%get_context()
 
@@ -411,11 +411,11 @@ function psb_dnrm2_weight_vect(x,w, desc_a, info,global,aux)  result(res)
   character(len=20)      :: name, ch_err
 
   name='psb_dnrm2v_weight'
+  call psb_erractionsave(err_act)
   if  (psb_errstatus_fatal()) then
     info = psb_err_internal_error_ ;    goto 9999
   end if
   info=psb_success_
-  call psb_erractionsave(err_act)
 
   ctxt=desc_a%get_context()
 
@@ -523,11 +523,11 @@ function psb_dnrm2_weightmask_vect(x,w,idv, desc_a, info,global, aux)  result(re
   character(len=20)      :: name, ch_err
 
   name='psb_dnrm2v_weightmask'
+  call psb_erractionsave(err_act)
   if  (psb_errstatus_fatal()) then
     info = psb_err_internal_error_ ;    goto 9999
   end if
   info=psb_success_
-  call psb_erractionsave(err_act)
 
   ctxt=desc_a%get_context()
 
diff --git a/base/psblas/psb_snrm2.f90 b/base/psblas/psb_snrm2.f90
index 01179882..d3cdaae2 100644
--- a/base/psblas/psb_snrm2.f90
+++ b/base/psblas/psb_snrm2.f90
@@ -302,11 +302,11 @@ function psb_snrm2_vect(x, desc_a, info,global)  result(res)
   character(len=20)      :: name, ch_err
 
   name='psb_snrm2v'
+  call psb_erractionsave(err_act)
   if  (psb_errstatus_fatal()) then
     info = psb_err_internal_error_ ;    goto 9999
   end if
   info=psb_success_
-  call psb_erractionsave(err_act)
 
   ctxt=desc_a%get_context()
 
@@ -411,11 +411,11 @@ function psb_snrm2_weight_vect(x,w, desc_a, info,global,aux)  result(res)
   character(len=20)      :: name, ch_err
 
   name='psb_snrm2v_weight'
+  call psb_erractionsave(err_act)
   if  (psb_errstatus_fatal()) then
     info = psb_err_internal_error_ ;    goto 9999
   end if
   info=psb_success_
-  call psb_erractionsave(err_act)
 
   ctxt=desc_a%get_context()
 
@@ -523,11 +523,11 @@ function psb_snrm2_weightmask_vect(x,w,idv, desc_a, info,global, aux)  result(re
   character(len=20)      :: name, ch_err
 
   name='psb_snrm2v_weightmask'
+  call psb_erractionsave(err_act)
   if  (psb_errstatus_fatal()) then
     info = psb_err_internal_error_ ;    goto 9999
   end if
   info=psb_success_
-  call psb_erractionsave(err_act)
 
   ctxt=desc_a%get_context()
 
diff --git a/base/psblas/psb_znrm2.f90 b/base/psblas/psb_znrm2.f90
index ae1e9e65..afb54aec 100644
--- a/base/psblas/psb_znrm2.f90
+++ b/base/psblas/psb_znrm2.f90
@@ -302,11 +302,11 @@ function psb_znrm2_vect(x, desc_a, info,global)  result(res)
   character(len=20)      :: name, ch_err
 
   name='psb_znrm2v'
+  call psb_erractionsave(err_act)
   if  (psb_errstatus_fatal()) then
     info = psb_err_internal_error_ ;    goto 9999
   end if
   info=psb_success_
-  call psb_erractionsave(err_act)
 
   ctxt=desc_a%get_context()
 
@@ -411,11 +411,11 @@ function psb_znrm2_weight_vect(x,w, desc_a, info,global,aux)  result(res)
   character(len=20)      :: name, ch_err
 
   name='psb_znrm2v_weight'
+  call psb_erractionsave(err_act)
   if  (psb_errstatus_fatal()) then
     info = psb_err_internal_error_ ;    goto 9999
   end if
   info=psb_success_
-  call psb_erractionsave(err_act)
 
   ctxt=desc_a%get_context()
 
@@ -523,11 +523,11 @@ function psb_znrm2_weightmask_vect(x,w,idv, desc_a, info,global, aux)  result(re
   character(len=20)      :: name, ch_err
 
   name='psb_znrm2v_weightmask'
+  call psb_erractionsave(err_act)
   if  (psb_errstatus_fatal()) then
     info = psb_err_internal_error_ ;    goto 9999
   end if
   info=psb_success_
-  call psb_erractionsave(err_act)
 
   ctxt=desc_a%get_context()