diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityTypePropertyTypePE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityTypePropertyTypePE.java
index 1154ae358f8a98b0548d75427cf4709bd967b51d..49a6438fc65afc6565d1387fcb4a227bbf68363f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityTypePropertyTypePE.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityTypePropertyTypePE.java
@@ -128,7 +128,7 @@ public abstract class EntityTypePropertyTypePE extends HibernateAbstractRegistra
     }
 
     @Column(name = ColumnNames.ORDINAL_COLUMN)
-    // TODO 2009-10-26, Piotr Buczek: add not null?
+    @NotNull(message = ValidationMessages.ORDINAL_NOT_NULL_MESSAGE)
     public Long getOrdinal()
     {
         return ordinal;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ValidationMessages.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ValidationMessages.java
index 32fe5aad32d14f0b2881e9a6c3b35718e5f5de0f..8bcb33678a972deb40b691ed53a242027ac93550 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ValidationMessages.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ValidationMessages.java
@@ -62,6 +62,8 @@ public final class ValidationMessages
 
     public static final String CODE_NOT_NULL_MESSAGE = "Code" + CAN_NOT_BE_NULL;
 
+    public static final String ORDINAL_NOT_NULL_MESSAGE = "Ordinal" + CAN_NOT_BE_NULL;
+
     public static final String NAME_NOT_NULL_MESSAGE = "Name" + CAN_NOT_BE_NULL;
 
     public static final String CODE_PATTERN_MESSAGE =
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/VocabularyTermPE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/VocabularyTermPE.java
index 4aa3d10a520bed7ec9699c08c3f057f2e04aeccb..de053d34b0879e5d2363975a534929591d8fb693 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/VocabularyTermPE.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/VocabularyTermPE.java
@@ -116,7 +116,7 @@ public class VocabularyTermPE extends HibernateAbstractRegistrationHolder implem
     }
 
     @Column(name = ColumnNames.ORDINAL_COLUMN)
-    // TODO 2009-10-26, Piotr Buczek: add not null?
+    @NotNull(message = ValidationMessages.ORDINAL_NOT_NULL_MESSAGE)
     public Long getOrdinal()
     {
         return ordinal;