diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/RiseClipseValidatorSCL.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/RiseClipseValidatorSCL.java
index 61e7b721c5d9df807d6bfeeeeae0b6722de3c2f9..c47d673dfdb7c76d9bbcf22a5781f8fed9f6d98b 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/RiseClipseValidatorSCL.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/RiseClipseValidatorSCL.java
@@ -43,6 +43,7 @@ import org.eclipse.emf.ecore.EValidator.SubstitutionLabelProvider;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.Diagnostician;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.ocl.pivot.validation.ComposedEValidator;
 
 public class RiseClipseValidatorSCL {
@@ -56,7 +57,7 @@ public class RiseClipseValidatorSCL {
     private static boolean oclValidation = false;
     private static boolean nsdValidation = false;
 
-    private static final IRiseClipseConsole console = new TextRiseClipseConsole();
+    @NonNull private static final IRiseClipseConsole console = new TextRiseClipseConsole();
 
     private static void usage() {
         console.setLevel( IRiseClipseConsole.INFO_LEVEL );
@@ -68,7 +69,7 @@ public class RiseClipseValidatorSCL {
         System.exit( -1 );
     }
 
-    public static void main( String[] args ) {
+    public static void main( @NonNull String[] args ) {
 
         if( args.length == 0 ) usage();
 
@@ -106,9 +107,9 @@ public class RiseClipseValidatorSCL {
         
         console.doNotDisplayIdenticalMessages();
 
-        ArrayList< String > oclFiles = new ArrayList<>();
-        ArrayList< String > nsdFiles = new ArrayList<>();
-        ArrayList< String > sclFiles = new ArrayList<>();
+        ArrayList< @NonNull String > oclFiles = new ArrayList<>();
+        ArrayList< @NonNull String > nsdFiles = new ArrayList<>();
+        ArrayList< @NonNull String > sclFiles = new ArrayList<>();
         for( int i = posFiles; i < args.length; ++i ) {
             if( args[i].endsWith( ".ocl" ) ) {
                 oclFiles.add( args[i] );
@@ -150,7 +151,7 @@ public class RiseClipseValidatorSCL {
         console.info( "" );
     }
 
-    private static void prepare( ArrayList< String > oclFiles, ArrayList< String > nsdFiles ) {
+    private static void prepare( ArrayList< @NonNull String > oclFiles, ArrayList< @NonNull String > nsdFiles ) {
         SclPackage sclPg = SclPackage.eINSTANCE;
         if( sclPg == null ) {
             throw new RiseClipseFatalException( "SCL package not found", null );
@@ -180,7 +181,7 @@ public class RiseClipseValidatorSCL {
 
     }
 
-    private static void run( boolean make_explicit_links, String sclFile ) {
+    private static void run( boolean make_explicit_links, @NonNull String sclFile ) {
         sclLoader.reset();
         Resource resource = sclLoader.loadWithoutValidation( sclFile );
         if( make_explicit_links ) {
@@ -193,7 +194,7 @@ public class RiseClipseValidatorSCL {
         }
     }
 
-    private static void validate( Resource resource, final AdapterFactory adapter ) {
+    private static void validate( @NonNull Resource resource, final AdapterFactory adapter ) {
         Map< Object, Object > context = new HashMap< Object, Object >();
         SubstitutionLabelProvider substitutionLabelProvider = new EValidator.SubstitutionLabelProvider() {