diff --git a/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java b/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java
index eaf87ca..42aae2b 100644
--- a/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java
+++ b/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java
@@ -101,6 +101,15 @@
         }
         // TODO this is NPE free but do we consider this as normal
         // or do we have to throw an MavenFilteringException with mavenSession cannot be null
+        //
+        // khmarbaise: 2016-05-21:
+        // If we throw an MavenFilteringException tests will fail which is
+        // caused by for example:     
+        // void copyFile( File from, final File to, boolean filtering, List<FileUtils.FilterWrapper> filterWrappers, String encoding )
+        // in MavenFileFilter interface where no MavenSession is given.
+        // So changing here to throw a MavenFilteringException would make
+        // it necessary to change the interface or we need to find a better solution.
+        // 
         if ( request.getMavenSession() != null )
         {
             // User properties have precedence over system properties