diff --git a/src/slave/containerizer/fetcher.cpp b/src/slave/containerizer/fetcher.cpp
index 8ae789a9f26..1f3b8499336 100644
--- a/src/slave/containerizer/fetcher.cpp
+++ b/src/slave/containerizer/fetcher.cpp
@@ -366,6 +366,9 @@ Future<Nothing> FetcherProcess::fetch(
     const string& sandboxDirectory,
     const Option<string>& user)
 {
+  if (commandInfo.uris_size() == 0) {
+    return Nothing();
+  }
   VLOG(1) << "Starting to fetch URIs for container: " << containerId
           << ", directory: " << sandboxDirectory;
 
diff --git a/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp b/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp
index 7b50258ef54..c7b12551862 100644
--- a/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp
+++ b/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp
@@ -596,7 +596,7 @@ Future<Nothing> LinuxFilesystemIsolatorProcess::recover(
           rootSandboxPath,
           entry.target);
 
-    // Since we pass the same 'entry.target' to 'parseSandboxPath' and
+    // Since we pass the same 'entry.target' to 'parseExecutorRunPath' and
     // 'parseSandboxPath', we should not see an error here.
     if (containerId.isError()) {
       return Failure("Parsing sandbox path failed: " + containerId.error());