diff --git a/src/support/ctool.cpp b/src/support/ctool.cpp
index 2c78676..c8b8cde 100644
--- a/src/support/ctool.cpp
+++ b/src/support/ctool.cpp
@@ -985,6 +985,10 @@ void ctool::set_obs_response(GCTAObservation* obs)
             // Get filenames
             GFilename expcube((*this)["expcube"].filename());
             GFilename psfcube((*this)["psfcube"].filename());
+            GFilename edispcube;
+            if (query_edisp) {
+                edispcube = (*this)["edispcube"].filename();
+            }
             GFilename bkgcube((*this)["bkgcube"].filename());
 
             // Extract stacked response information if available
@@ -1004,9 +1008,6 @@ void ctool::set_obs_response(GCTAObservation* obs)
                 // query it now
                 if (query_edisp) {
 
-                    // Get filename
-                    GFilename edispcube((*this)["edispcube"].filename());
-
                     // If filename is valid then use energy dispersion ...
                     if ((gammalib::toupper(edispcube.url()) != "NONE") &&
                         !edispcube.is_empty()) {
diff --git a/test/testing.py b/test/testing.py
index 3d9d9ca..be0bec3 100755
--- a/test/testing.py
+++ b/test/testing.py
@@ -78,7 +78,6 @@ class test(gammalib.GPythonTestSuite):
             rc = os.system(cmd+' >/dev/null 2>&1')
         except:
             rc = -1
-            pass
 
         # Return return code
         return rc