diff --git a/compiler2/ttcn3/Ttcnstuff.cc b/compiler2/ttcn3/Ttcnstuff.cc
index acf2ed00277388d5021587486569772e002a31d8..290307950ee2e63dfc19dc1b61e6df93fcaa6561 100644
--- a/compiler2/ttcn3/Ttcnstuff.cc
+++ b/compiler2/ttcn3/Ttcnstuff.cc
@@ -3562,7 +3562,7 @@ namespace Ttcn {
     }
     checked = true;
     if ((final && abstract) || (final && trait) || (abstract && trait)) {
-      error("A classes cannot have more than one of the @final, @abstract and @trait modifiers");
+      error("A class cannot have more than one of the @final, @abstract and @trait modifiers");
     }
     if (external && abstract) { // todo
       error("External classes cannot be abstract");
diff --git a/conformance_test/OOP_tests/negative_tests/50101_classes.script b/conformance_test/OOP_tests/negative_tests/50101_classes.script
index fe51b1147b166ac5ef000c6a4c438bd65e123ac6..2a8fc40c7c789c3a5333105eb62b6e1d4d41afce 100644
--- a/conformance_test/OOP_tests/negative_tests/50101_classes.script
+++ b/conformance_test/OOP_tests/negative_tests/50101_classes.script
@@ -360,7 +360,7 @@ module NegSem_5010104_finalClasses_001 "TTCN-3:2018 Object-Oriented" {
 <END_MODULE>
 
 <RESULT COUNT>
-error: Final classes cannot be abstract
+error: A class cannot have more than one of the \@final, \@abstract and \@trait modifiers
 <END_RESULT>
 
 <END_TC>
diff --git a/function_test/Semantic_Analyser/oop/oop_SE.ttcn b/function_test/Semantic_Analyser/oop/oop_SE.ttcn
index 00ea89bff2ac11534860bf878b821aa4e33d706c..c133753a5e662e744a3d2e558b3e27d55b367753 100644
--- a/function_test/Semantic_Analyser/oop/oop_SE.ttcn
+++ b/function_test/Semantic_Analyser/oop/oop_SE.ttcn
@@ -346,7 +346,7 @@ function f_create() { //^In function definition//
 }
 
 
-type class @final @abstract C21 { } //^In type definition// //A classes cannot have more than one of the \@final, \@abstract and \@trait modifiers//
+type class @final @abstract C21 { } //^In type definition// //A class cannot have more than one of the \@final, \@abstract and \@trait modifiers//
 
 type class @final C22 { }