diff --git a/matlab/check_list_of_variables.m b/matlab/check_list_of_variables.m
index a2ca4e98d0cec65ef1b2a01af848082038707cd2..7ed79ccd96e1ad839812fe09a817e39fcd66de4d 100644
--- a/matlab/check_list_of_variables.m
+++ b/matlab/check_list_of_variables.m
@@ -34,11 +34,9 @@ function varlist = check_list_of_variables(options_, M_, varlist)
     if isempty(varlist)
         disp(' ')
         disp(['You did not declared endogenous variables after the estimation command.'])
-        info = 0;
         cas = [];
         if options_.bayesian_irf
             cas = 'Posterior IRFs';
-            info=1;
         end
         if options_.moments_varendo
             if isempty(cas)
@@ -46,7 +44,6 @@ function varlist = check_list_of_variables(options_, M_, varlist)
             else
                 cas = [ cas , ', posterior moments'];
             end
-            info=1;
         end
         if options_.smoother
             if isempty(cas)
@@ -54,7 +51,6 @@ function varlist = check_list_of_variables(options_, M_, varlist)
             else
                 cas = [ cas , ', posterior smoothed variables'];
             end
-            info=1;
         end
         if options_.smoother
             if isempty(cas)
@@ -62,7 +58,6 @@ function varlist = check_list_of_variables(options_, M_, varlist)
             else
                 cas = [ cas , ', posterior smoothed variables'];
             end
-            info=1;
         end
         if ~isempty(options_.filter_step_ahead)
             if isempty(cas)
@@ -70,7 +65,6 @@ function varlist = check_list_of_variables(options_, M_, varlist)
             else
                 cas = [ cas , ', posterior k-step ahead filtered variables'];
             end
-            info=1;
         end
         if options_.forecast
             if isempty(cas)
@@ -78,12 +72,11 @@ function varlist = check_list_of_variables(options_, M_, varlist)
             else
                 cas = [ cas , ' and posterior forecats'];
             end
-            info=1;
         end
-        string = [ cas , ' will be computed for the ' num2str(M_.endo_nbr)  ' endogenous variables'];
-        string = [ string ' of your model, this can be very long....']; 
-        format_text( string, 10)
-        if info
+        if ~isempty(cas)
+            string = [ cas , ' will be computed for the ' num2str(M_.endo_nbr)  ' endogenous variables'];
+            string = [ string ' of your model, this can be very long....']; 
+            format_text(string, 10)
             choice = [];
             while isempty(choice)
                 disp(' ')
diff --git a/matlab/dynare_estimation.m b/matlab/dynare_estimation.m
index 025461b76ea2aac0afde13930f5288de520d060c..80319c69486698ce2ec99c8f09f89692b9a0a41b 100644
--- a/matlab/dynare_estimation.m
+++ b/matlab/dynare_estimation.m
@@ -30,7 +30,7 @@ function dynare_estimation(var_list_)
 
 global M_ options_ oo_ estim_params_ bayestopt_
 
-var_list_ = check_list_of_variables(options_, M_, var_list_)
+var_list_ = check_list_of_variables(options_, M_, var_list_);
 %if isempty(var_list_)
 %    return
 %else