diff --git a/src/main/java/nl/tudelft/ewi/tam/beans/User.java b/src/main/java/nl/tudelft/ewi/tam/beans/User.java
index cfee82871a54c81d1420be415edadce01948dcf9..0e7fc01a9472c4b12d8ff80168681d3184d2c000 100644
--- a/src/main/java/nl/tudelft/ewi/tam/beans/User.java
+++ b/src/main/java/nl/tudelft/ewi/tam/beans/User.java
@@ -212,6 +212,12 @@ public class User {
* @return value of the {@link Integer} instance representing the student number of the user
*/
public Integer getStudentNumber() {
+ if (studentNumber == null) {
+ // Because some students don't have a student_number in the database.
+ // Ref: https://gitlab.ewi.tudelft.nl/eip/tam/tam/issues/13.
+ studentNumber = 0;
+ }
+
return studentNumber;
}
diff --git a/src/main/java/nl/tudelft/ewi/tam/controllers/BatchExportController.java b/src/main/java/nl/tudelft/ewi/tam/controllers/BatchExportController.java
index 8ea667ce5233660561998b63785b123551533818..18c4ea9f0ba51d963aec2ce8bd2a9c32ebad8b06 100644
--- a/src/main/java/nl/tudelft/ewi/tam/controllers/BatchExportController.java
+++ b/src/main/java/nl/tudelft/ewi/tam/controllers/BatchExportController.java
@@ -50,7 +50,7 @@ public class BatchExportController {
*/
@PreAuthorize("@authorizationService.accessUserInformation(principal, #netid)")
@RequestMapping(method = RequestMethod.GET, value = "/batch-export")
- public void getBatchImport(final HttpServletResponse response) throws IOException {
+ public void getBatchExport(final HttpServletResponse response) throws IOException {
response.setContentType("text/csv");
final List<User> allUsers = userService.getStudents();