diff --git a/opm/simulators/flow/BlackoilModel.hpp b/opm/simulators/flow/BlackoilModel.hpp
index 6c6c0ef94..d1442441c 100644
--- a/opm/simulators/flow/BlackoilModel.hpp
+++ b/opm/simulators/flow/BlackoilModel.hpp
@@ -1154,12 +1154,10 @@ namespace Opm {
 
         total_penaltyCard_ += report.getPenaltyCard();
 
-
-
         if (param_.convergence_monitoring_ && (total_penaltyCard_.total() > param_.convergence_monitoring_cutoff_)) {
             report.setReservoirFailed({ConvergenceReport::ReservoirFailure::Type::ConvergenceMonitorFailure,
-                                        ConvergenceReport::Severity::ConvergenceMonitorFailure,
-                                        -1}); // -1 indicates it's not specific to any component
+                                       ConvergenceReport::Severity::ConvergenceMonitorFailure,
+                                       -1}); // -1 indicates it's not specific to any component
         }
     }
 
diff --git a/opm/simulators/timestepping/AdaptiveTimeStepping.hpp b/opm/simulators/timestepping/AdaptiveTimeStepping.hpp
index a8d1524d2..bd6accd82 100644
--- a/opm/simulators/timestepping/AdaptiveTimeStepping.hpp
+++ b/opm/simulators/timestepping/AdaptiveTimeStepping.hpp
@@ -248,8 +248,8 @@ void registerAdaptiveParameters();
                     // since linearIterations is < 0 this will restart the solver
                 }
                 catch (const ConvergenceMonitorFailure& e) {
-                    causeOfFailure = "Convergence monitor failure";
                     substepReport = solver.failureReport();
+                    causeOfFailure = "Convergence monitor failure";
                 }
                 catch (const LinearSolverProblem& e) {
                     substepReport = solver.failureReport();
diff --git a/opm/simulators/timestepping/ConvergenceReport.hpp b/opm/simulators/timestepping/ConvergenceReport.hpp
index 3724b746a..82b826c78 100644
--- a/opm/simulators/timestepping/ConvergenceReport.hpp
+++ b/opm/simulators/timestepping/ConvergenceReport.hpp
@@ -45,13 +45,13 @@ namespace Opm
             ReservoirFailed = 1 << 0,
             WellFailed      = 1 << 1,
         };
-
+        // More severe problems should have higher numbers
         enum struct Severity {
             None       = 0,
             Normal     = 1,
-            TooLarge   = 2,
-            NotANumber = 3,
-            ConvergenceMonitorFailure = 4,
+            ConvergenceMonitorFailure = 2,
+            TooLarge   = 3,
+            NotANumber = 4,
         };
 
         struct PenaltyCard {