diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServlet.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServlet.java
index e08ac8adc4c6c739969ee2921c7452db539fe45f..27f04f5660341e9142cce6a2ef2da38af76f15d3 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServlet.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServlet.java
@@ -344,8 +344,8 @@ public class DatasetDownloadServlet extends AbstractDatasetDownloadServlet
         IHierarchicalContentNode node = renderingContext.getContentNode();
         if (node.exists() == false)
         {
-            throw new EnvironmentFailureException("Resource '" + node.getName()
-                    + "' does not exist.");
+            throw new EnvironmentFailureException("Resource '" + node.getRelativePath()
+                    + "' does not exist in data set '" + dataSetCode + "'.");
         }
 
         // If we want to browse a directory, we need a whole dataset metadata from openbis to
@@ -434,7 +434,7 @@ public class DatasetDownloadServlet extends AbstractDatasetDownloadServlet
         {
             operationLog.info(String.format("For data set '%s' show directory '%s'",
                     dataSet.getCode(),
-                    (dirNode.getRelativePath() == null) ? "(root)" : dirNode.getRelativePath()));
+                    (dirNode.getRelativePath() == null) ? "/" : dirNode.getRelativePath()));
         }
         IDirectoryRenderer directoryRenderer =
                 rendererFactory.createDirectoryRenderer(renderingContext);
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/RenderingContext.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/RenderingContext.java
index 6b132317e0f7439f73b391a9697519011484a4d8..b65b68e1707ca894e4d3251db8b146ed1eb701a4 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/RenderingContext.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/RenderingContext.java
@@ -79,7 +79,7 @@ final class RenderingContext
 
     public final IHierarchicalContentNode getContentNode()
     {
-        return rootContent.getNode(relativePathOrNull);
+        return fileNode;
     }
 
     public final File getRootDir()
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServletTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServletTest.java
index 8d2a4b2eb7e8643a6858652f821bcaee9af3cdb6..9a5bfc89a6dc115da953d9c278b5f57782869df5 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServletTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServletTest.java
@@ -227,8 +227,7 @@ public class DatasetDownloadServletTest
         String normalizedLogContent = getNormalizedLogContent();
         assertContains(getSessionCreationLogMessage() + OSUtilities.LINE_SEPARATOR + LOG_INFO
                 + "Data set '1234-1' obtained from openBIS server.", normalizedLogContent);
-        assertContains(LOG_INFO + "For data set '1234-1' show directory '(root)'",
-                normalizedLogContent);
+        assertContains(LOG_INFO + "For data set '1234-1' show directory '/'", normalizedLogContent);
 
         context.assertIsSatisfied();
     }
@@ -287,7 +286,8 @@ public class DatasetDownloadServletTest
         DatasetDownloadServlet servlet = createServlet();
         servlet.doGet(request, response);
         String pageContent = writer.toString();
-        String snippet = "Resource 'blabla' does not exist.";
+        String snippet =
+                "Resource 'blabla' does not exist in data set '" + EXAMPLE_DATA_SET_CODE + "'.";
         assertEquals("Text snippet >" + snippet + "< not found in following page content: "
                 + pageContent, true, pageContent.indexOf(snippet) > 0);
         String logContent = logRecorder.getLogContent();
@@ -498,8 +498,9 @@ public class DatasetDownloadServletTest
         DatasetDownloadServlet servlet = createServlet();
         servlet.doGet(request, response);
         assertEquals("<html><body><h1>Error</h1>" + OSUtilities.LINE_SEPARATOR
-                + "Resource 'blabla' does not exist." + OSUtilities.LINE_SEPARATOR
-                + "</body></html>" + OSUtilities.LINE_SEPARATOR, writer.toString());
+                + "Resource 'blabla' does not exist in data set '" + EXAMPLE_DATA_SET_CODE + "'."
+                + OSUtilities.LINE_SEPARATOR + "</body></html>" + OSUtilities.LINE_SEPARATOR,
+                writer.toString());
         String logContent = getNormalizedLogContent();
         String[] logContentLines = logContent.split("\n");
         // Skip the first line which has information about session creation