diff --git a/matlab/dsge_likelihood.m b/matlab/dsge_likelihood.m
index ee0c606a3..58272ae05 100644
--- a/matlab/dsge_likelihood.m
+++ b/matlab/dsge_likelihood.m
@@ -259,7 +259,7 @@ end
 
 % Return, with endogenous penalty when possible, if dynare_resolve issues an error code (defined in resol).
 if info(1) == 1 || info(1) == 2 || info(1) == 5 || info(1) == 7 || info(1) ...
-            == 8 || info(1) == 22 || info(1) == 24 || info(1) == 19
+            == 8 || info(1) == 22 || info(1) == 24 || info(1) == 19 || info(1) == 25
     fval = objective_function_penalty_base+1;
     info = info(1);
     exit_flag = 0;
diff --git a/matlab/dsge_var_likelihood.m b/matlab/dsge_var_likelihood.m
index f4cf0a8b2..b47f54481 100644
--- a/matlab/dsge_var_likelihood.m
+++ b/matlab/dsge_var_likelihood.m
@@ -131,7 +131,7 @@ end
 
 % Return, with endogenous penalty when possible, if dynare_resolve issues an error code (defined in resol).
 if info(1) == 1 || info(1) == 2 || info(1) == 5 || info(1) == 7 || info(1) ...
-            == 8 || info(1) == 22 || info(1) == 24
+            == 8 || info(1) == 22 || info(1) == 24 || info(1) == 25
     fval = objective_function_penalty_base+1;
     info = info(1);
     exit_flag = 0;
diff --git a/matlab/non_linear_dsge_likelihood.m b/matlab/non_linear_dsge_likelihood.m
index a76d73075..4ea45c814 100644
--- a/matlab/non_linear_dsge_likelihood.m
+++ b/matlab/non_linear_dsge_likelihood.m
@@ -217,7 +217,7 @@ end
 % Linearize the model around the deterministic sdteadystate and extract the matrices of the state equation (T and R).
 [T,R,SteadyState,info,Model,DynareOptions,DynareResults] = dynare_resolve(Model,DynareOptions,DynareResults,'restrict');
 
-if info(1) == 1 || info(1) == 2 || info(1) == 5
+if info(1) == 1 || info(1) == 2 || info(1) == 5 || info(1) == 25
     fval = objective_function_penalty_base+1;
     exit_flag = 0;
     return
diff --git a/preprocessor/DynamicModel.cc b/preprocessor/DynamicModel.cc
index c3aa03747..ca2051329 100644
--- a/preprocessor/DynamicModel.cc
+++ b/preprocessor/DynamicModel.cc
@@ -1516,7 +1516,7 @@ DynamicModel::writeDynamicMFile(const string &dynamic_basename) const
                     << "% Inputs :" << endl
                     << "%   y         [#dynamic variables by 1] double    vector of endogenous variables in the order stored" << endl
                     << "%                                                 in M_.lead_lag_incidence; see the Manual" << endl
-                    << "%   x         [M_.exo_nbr by nperiods] double     matrix of exogenous variables (in declaration order)" << endl
+                    << "%   x         [nperiods by M_.exo_nbr] double     matrix of exogenous variables (in declaration order)" << endl
                     << "%                                                 for all simulation periods" << endl
                     << "%   params    [M_.param_nbr by 1] double          vector of parameter values in declaration order" << endl
                     << "%   it_       scalar double                       time period for exogenous variables for which to evaluate the model" << endl