diff --git a/src/elpa_impl.F90 b/src/elpa_impl.F90
index effd76bdbd81bd38f6ee3f29637e8311169aaf47..f461135ab7eea53f92cdf620d0eabc2d5b88055d 100644
--- a/src/elpa_impl.F90
+++ b/src/elpa_impl.F90
@@ -497,7 +497,7 @@ module elpa_impl
         stop
       endif
       call self%get("blacs_context", blacs_ctx, error)
-      if(check_elpa_get(error, ELPA_ERROR)) return
+      if(check_elpa_get(error, ELPA_ERROR_CRITICAL)) return
 
       sc_desc(1) = 1
       sc_desc(2) = blacs_ctx
@@ -613,7 +613,6 @@ module elpa_impl
       nullify(string)
 
       call self%get(option_name, val, actual_error)
-      if(check_elpa_get(error, ELPA_ERROR)) return
       if (actual_error /= ELPA_OK) then
         if (present(error)) then
           error = actual_error