diff --git a/src/js/components/AppDebugInfoComponent.jsx b/src/js/components/AppDebugInfoComponent.jsx
index a56ef0288..95cc2ee6a 100644
--- a/src/js/components/AppDebugInfoComponent.jsx
+++ b/src/js/components/AppDebugInfoComponent.jsx
@@ -6,6 +6,7 @@ import AppsActions from "../actions/AppsActions";
 import AppsEvents from "../events/AppsEvents";
 import AppTaskStatsListComponent from "../components/AppTaskStatsListComponent";
 import TaskMesosUrlComponent from "../components/TaskMesosUrlComponent";
+import TaskFileDownloadComponent from "../components/TaskFileDownloadComponent";
 import UnspecifiedNodeComponent from "../components/UnspecifiedNodeComponent";
 
 function invalidateValue(value, suffix) {
@@ -89,7 +90,10 @@ var AppDebugInfoComponent = React.createClass({
           <span>{version}</span> ({new Moment(version).fromNow()})
         </dd>
         <dt>Mesos details</dt>
-        <dd><TaskMesosUrlComponent task={lastTaskFailure}/></dd>
+        <dd><TaskMesosUrlComponent task={lastTaskFailure}/>
+          <TaskFileDownloadComponent task={lastTaskFailure} fileName="stderr" />
+          <TaskFileDownloadComponent task={lastTaskFailure} fileName="stdout" />
+        </dd>
       </dl>
     );
   },
diff --git a/src/js/stores/MesosStore.js b/src/js/stores/MesosStore.js
index c4710d479..1966cabe7 100644
--- a/src/js/stores/MesosStore.js
+++ b/src/js/stores/MesosStore.js
@@ -150,7 +150,9 @@ function getExecutorDirectoryFromState(frameworkId, taskId, state) {
 
   if (framework.executors != null) {
     executor = framework.executors.find(matchExecutor);
-  } else if (framework.completed_executors != null) {
+  }
+
+  if (framework.completed_executors != null && executor == null) {
     executor = framework.completed_executors.find(matchExecutor);
   }
 
diff --git a/src/test/units/AppDebugInfoComponent.test.js b/src/test/units/AppDebugInfoComponent.test.js
index 8a4c5bbb4..7c3ebf27c 100644
--- a/src/test/units/AppDebugInfoComponent.test.js
+++ b/src/test/units/AppDebugInfoComponent.test.js
@@ -79,7 +79,7 @@ describe("App debug info component", function () {
           var host = nodes.at(3).text().trim();
           var timestamp = nodes.at(4).find("span").text().trim();
           var version = nodes.at(5).find("span").text().trim();
-          var details = nodes.at(6).find("a").props().href;
+          var details = nodes.at(6).find("a").at(0).props().href;
 
           expect(taskId)
             .to.equal("python.83c0a69b-256a-11e5-aaed-fa163eaaa6b7");