diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/RowCalculatorTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/RowCalculatorTest.java
index 1ca59ae885873dee8d86d41fe7cd704aba24eb68..dfb2433f033b930e19341ad94edb7095bab6ab49 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/RowCalculatorTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/RowCalculatorTest.java
@@ -224,8 +224,9 @@ public class RowCalculatorTest extends AssertJUnit
             fail("EvaluatorException expected");
         } catch (EvaluatorException e)
         {
-            assertEquals("Error evaluating 'minOrDefault([0.0,None,'  ',-2,'-3'])': "
-                    + "TypeError: minOrDefault(): expected 2 args; got 1", e.getMessage());
+            assertEquals(
+                    "Error occurred in line 1 of the script when evaluating 'minOrDefault([0.0,None,'  ',-2,'-3'])': "
+                            + "TypeError: minOrDefault(): expected 2 args; got 1", e.getMessage());
         }
 
         calculator = createCalculator(parameters, "minOrDefault([${x},None,'  ',-2,'-3'], 38.6)");
@@ -248,8 +249,9 @@ public class RowCalculatorTest extends AssertJUnit
             fail("EvaluatorException expected");
         } catch (EvaluatorException e)
         {
-            assertEquals("Error evaluating 'maxOrDefault([0.0,None,'  ',-2,'-3'])': "
-                    + "TypeError: maxOrDefault(): expected 2 args; got 1", e.getMessage());
+            assertEquals(
+                    "Error occurred in line 1 of the script when evaluating 'maxOrDefault([0.0,None,'  ',-2,'-3'])': "
+                            + "TypeError: maxOrDefault(): expected 2 args; got 1", e.getMessage());
         }
 
         calculator = createCalculator(parameters, "maxOrDefault([${x},None,'  ',-2,'-3'], 38.6)");
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManagerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManagerTest.java
index b1812274e75908ece7d26e7bbd346f3ea645a2d5..a78d1e33aa9ad03e752f83f412569b8f9c259b01 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManagerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManagerTest.java
@@ -844,9 +844,10 @@ public final class CachedResultSetManagerTest extends AssertJUnit
 
         list = resultSet.getList();
         assertEquals(1, list.size());
-        assertEquals("0-a0 Error: (Error evaluating 'row.col('blabla')': "
-                + "java.lang.IllegalArgumentException: "
-                + "java.lang.IllegalArgumentException: Unknown column ID: blabla).",
+        assertEquals(
+                "0-a0 Error: (Error occurred in line 1 of the script when evaluating 'row.col('blabla')': "
+                        + "java.lang.IllegalArgumentException: "
+                        + "java.lang.IllegalArgumentException: Unknown column ID: blabla).",
                 render(list.get(0)));
 
         context.assertIsSatisfied();
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/CustomColumnUtilsTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/CustomColumnUtilsTest.java
index a4ed41e054f3d1fa6eaf7b27819bda675f745c40..fcd4130092feb9f26c467f01fc72b2e1f6a6745e 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/CustomColumnUtilsTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/CustomColumnUtilsTest.java
@@ -140,8 +140,8 @@ public class CustomColumnUtilsTest extends AssertJUnit
                 GridExpressionUtils.evalCustomColumn(dataProvider, customColumn, true);
 
         assertEquals(
-                "[Error: (Error evaluating 'junk + 10': NameError: name 'junk' is not defined).]",
-                values.toString());
+                "[Error: (Error occurred in line 1 of the script when evaluating 'junk + 10': "
+                        + "NameError: name 'junk' is not defined).]", values.toString());
     }
 
 }
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/dynamic_property/DynamicPropertyEvaluatorTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/dynamic_property/DynamicPropertyEvaluatorTest.java
index a67f4ba566c210778d7c59f8d3d1647a33550b56..c149d491d88f683ad56cd1448c0fc312c776b232 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/dynamic_property/DynamicPropertyEvaluatorTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/dynamic_property/DynamicPropertyEvaluatorTest.java
@@ -150,7 +150,8 @@ public class DynamicPropertyEvaluatorTest extends AbstractBOTest
         assertEquals(expectedDp1ErrorValue, dp1Error.getValue());
         assertEquals(properties.size() + "", dp2.getValue());
         final String expectedDp3ErrorValue =
-                expectedErrorMessage("Error evaluating '" + s3
+                expectedErrorMessage("Error occurred in line 1 of the script when evaluating '"
+                        + s3
                         + "': AttributeError: 'ch.systemsx.cisd.openbis.generic.server.business.b'"
                         + " object has no attribute 'getCode'");
         assertEquals(expectedDp3ErrorValue, dp3Error.getValue());
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/dynamic_property/calculator/DynamicPropertyCalculatorTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/dynamic_property/calculator/DynamicPropertyCalculatorTest.java
index 70d3a8d18c22bdb9ff13d044c71f036195ad82c0..c92d78fc213285663c70dc9a1b52f2278532ce66 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/dynamic_property/calculator/DynamicPropertyCalculatorTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/dynamic_property/calculator/DynamicPropertyCalculatorTest.java
@@ -127,7 +127,9 @@ public class DynamicPropertyCalculatorTest extends AssertJUnit
             fail("expected EvaluatorException");
         } catch (EvaluatorException e)
         {
-            final String expectedMsg = "Error evaluating 'calculate()': NameError: name 'calculate' is not defined";
+            final String expectedMsg =
+                    "Error occurred in line 1 of the script when evaluating 'calculate()': "
+                            + "NameError: name 'calculate' is not defined";
             assertEquals("expected exception message: " + expectedMsg, expectedMsg, e.getMessage());
         }
     }