diff --git a/Common/Options.cpp b/Common/Options.cpp
index e57cb6acd56fbc0859ff78534c9fa8f23c314973..b5fff7e397a67fc7abda4be1f198b30195abf118 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -6108,16 +6108,17 @@ double opt_view_timestep(OPT_ARGS_NUM)
 {
 #if defined(HAVE_POST)
   GET_VIEW(0.);
-  if(!data) return 0;
   if(action & GMSH_SET) {
     opt->timeStep = (int)val;
-    if(opt->timeStep > data->getNumTimeSteps() - 1)
-      opt->timeStep = 0;
-    else if(opt->timeStep < 0)
-      opt->timeStep = data->getNumTimeSteps() - 1;
-    if(data->getAdaptiveData())
-      data->getAdaptiveData()->changeResolution
-        (opt->timeStep, opt->maxRecursionLevel, opt->targetError);
+    if(data){
+      if(opt->timeStep > data->getNumTimeSteps() - 1)
+        opt->timeStep = 0;
+      else if(opt->timeStep < 0)
+        opt->timeStep = data->getNumTimeSteps() - 1;
+      if(data->getAdaptiveData())
+        data->getAdaptiveData()->changeResolution
+          (opt->timeStep, opt->maxRecursionLevel, opt->targetError);
+    }
     if(view) view->setChanged(true);
   }
 #if defined(HAVE_FLTK)