Index: lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java =================================================================== diff -u -r351f9417a32d396911387eeef3117fd40be35b7c -rc9dcdb147408e9aa753ec1034f006e6311596767 --- lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java (.../ImportService.java) (revision 351f9417a32d396911387eeef3117fd40be35b7c) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java (.../ImportService.java) (revision c9dcdb147408e9aa753ec1034f006e6311596767) @@ -310,7 +310,9 @@ rowResult = new ArrayList<>(); StringBuilder generatedPassword = new StringBuilder(); row = sheet.getRow(i); - user = parseUser(row, i, generatedPassword); + if (row != null) { + user = parseUser(row, i, generatedPassword); + } if (emptyRow) { ImportService.log.debug("Row " + i + " is empty.");