diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/server/QueryClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/server/QueryClientService.java
index 768c216e07594f9d6869256c0e793446d83d286f..7bc7dc2d09eeeff0107eb48dbe82e6e8c0a98425 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/server/QueryClientService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/server/QueryClientService.java
@@ -95,8 +95,7 @@ public class QueryClientService extends AbstractClientService implements IQueryC
             final String sessionToken = getSessionToken();
             final TableModel tableModel =
                     queryServer.queryDatabase(sessionToken, sqlQuery, bindingsOrNull);
-            String resultSetKey = saveInCache(tableModel.getRows());
-            return new TableModelReference(resultSetKey, tableModel.getHeader());
+            return createTableModelReference(tableModel);
         } catch (final UserFailureException e)
         {
             throw UserFailureExceptionTranslator.translate(e);
@@ -111,14 +110,19 @@ public class QueryClientService extends AbstractClientService implements IQueryC
             final String sessionToken = getSessionToken();
             final TableModel tableModel =
                     queryServer.queryDatabase(sessionToken, query, bindingsOrNull);
-            String resultSetKey = saveInCache(tableModel.getRows());
-            return new TableModelReference(resultSetKey, tableModel.getHeader());
+            return createTableModelReference(tableModel);
         } catch (final UserFailureException e)
         {
             throw UserFailureExceptionTranslator.translate(e);
         }
     }
 
+    private TableModelReference createTableModelReference(TableModel tableModel)
+    {
+        String resultSetKey = saveInCache(tableModel.getRows());
+        return new TableModelReference(resultSetKey, tableModel.getHeader());
+    }
+
     public List<QueryExpression> listQueries()
             throws ch.systemsx.cisd.openbis.generic.client.web.client.exception.UserFailureException
     {