diff -r 30b840ed8c0e -r 822b7e3d064d src/main/java/de/uapcore/lightpit/dao/postgres/PGUserDao.java --- a/src/main/java/de/uapcore/lightpit/dao/postgres/PGUserDao.java Fri Oct 23 18:40:50 2020 +0200 +++ b/src/main/java/de/uapcore/lightpit/dao/postgres/PGUserDao.java Fri Oct 23 20:34:57 2020 +0200 @@ -40,6 +40,7 @@ import java.util.Objects; import java.util.Optional; +import static de.uapcore.lightpit.dao.Functions.getSafeString; import static de.uapcore.lightpit.dao.Functions.setStringOrNull; public final class PGUserDao implements UserDao { @@ -68,9 +69,9 @@ if (id == 0) return null; final var user = new User(id); user.setUsername(result.getString("username")); - user.setGivenname(result.getString("givenname")); - user.setLastname(result.getString("lastname")); - user.setMail(result.getString("mail")); + user.setGivenname(getSafeString(result, "givenname")); + user.setLastname(getSafeString(result, "lastname")); + user.setMail(getSafeString(result, "mail")); return user; }