diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/MaterialUploadSectionsParser.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/MaterialUploadSectionsParser.java
index 6eaf131a22cba0962eb3d7798643d01b5230b5f7..8c1fdd629d9ff01025beb7a16016f3fb2599b9e7 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/MaterialUploadSectionsParser.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/MaterialUploadSectionsParser.java
@@ -84,10 +84,10 @@ public class MaterialUploadSectionsParser
         return new BatchMaterialsOperation(newSamples, results, parseCodes(newSamples));
     }
 
-    private static String[] parseCodes(final List<NewMaterialsWithTypes> newSamples)
+    private static String[] parseCodes(final List<NewMaterialsWithTypes> newMaterials)
     {
         List<String> codes = new ArrayList<String>();
-        for (NewMaterialsWithTypes st : newSamples)
+        for (NewMaterialsWithTypes st : newMaterials)
         {
             for (NewMaterial s : st.getNewEntities())
             {
@@ -108,8 +108,8 @@ public class MaterialUploadSectionsParser
             List<FileSection> materialSections = new ArrayList<FileSection>();
             if (materialType.isDefinedInFileEntityTypeCode())
             {
-                materialSections
-                        .addAll(FileSection.extractSections(multipartFile.getUnicodeReader()));
+                materialSections.addAll(FileSection.extractSections(multipartFile
+                        .getUnicodeReader()));
             } else
             {
                 materialSections.add(FileSection.createFromInputStream(