diff --git a/ComputingTasks.cc b/ComputingTasks.cc
index da1aa461..a5c6ffa7 100644
--- a/ComputingTasks.cc
+++ b/ComputingTasks.cc
@@ -1242,8 +1242,5 @@ SvarStatement::writeOutput(ostream &output, const string &basename) const
     else
       output << ".equations = " << it0->second << ";" << endl;
   else
-    {
-      cerr << "SvarStatement::writeOutput() Should not arrive here (3). Please report this to the Dynare Team." << endl;
-      exit(EXIT_FAILURE);
-    }
+    output << ".equations = 'ALL';" << endl;
 }
diff --git a/ParsingDriver.cc b/ParsingDriver.cc
index ebcbc65f..d379ec57 100644
--- a/ParsingDriver.cc
+++ b/ParsingDriver.cc
@@ -1222,9 +1222,7 @@ ParsingDriver::svar()
     error("The value passed to the chain option must be greater than zero.");
 
   it0 = options_list.num_options.find("ms.equations");
-  if (it0 == options_list.num_options.end())
-    error("A chain option must be passed to the svar statement.");
-  else
+  if (it0 != options_list.num_options.end())
     {
       string strNextNumber;
       for (string::const_iterator it=it0->second.begin(); it<it0->second.end(); it++)