diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ScriptDAOTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ScriptDAOTest.java
index 23b7533f4c5f9bcdd4a2641f84fb180438085625..2879d7051e2f797f7e0d2261121c531a1c4838aa 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ScriptDAOTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ScriptDAOTest.java
@@ -137,13 +137,16 @@ public final class ScriptDAOTest extends AbstractDAOTest
             }
         }
         assertNotNull(registered);
-        assert registered != null;// for Eclipse
-        assertEquals(script.getScriptType(), registered.getScriptType());
-        assertEquals(script.getDatabaseInstance(), registered.getDatabaseInstance());
-        assertEquals(script.getScript(), registered.getScript());
-        assertEquals(script.getDescription(), registered.getDescription());
-        assertEquals(script.getName(), registered.getName());
-        assertEquals(script.getEntityKind(), registered.getEntityKind());
+
+        if (registered != null) // for Eclipse
+        {
+            assertEquals(script.getScriptType(), registered.getScriptType());
+            assertEquals(script.getDatabaseInstance(), registered.getDatabaseInstance());
+            assertEquals(script.getScript(), registered.getScript());
+            assertEquals(script.getDescription(), registered.getDescription());
+            assertEquals(script.getName(), registered.getName());
+            assertEquals(script.getEntityKind(), registered.getEntityKind());
+        }
     }
 
     @Test(dataProvider = "scriptTypes")