diff --git a/restservice/src/main/java/com/plannaplan/responses/models/UserResponse.java b/restservice/src/main/java/com/plannaplan/responses/models/UserResponse.java
index 166718c..ac606ac 100755
--- a/restservice/src/main/java/com/plannaplan/responses/models/UserResponse.java
+++ b/restservice/src/main/java/com/plannaplan/responses/models/UserResponse.java
@@ -14,8 +14,8 @@ public class UserResponse {
 
     public UserResponse(User user) {
         this.id = user.getId();
-        this.name = user.getName();
-        this.surname = user.getSurname();
+        this.name = user.getName() != null ? user.getName() : "";
+        this.surname = user.getSurname() != null ? user.getSurname() : "";
         this.email = user.getEmail();
     }