diff --git a/restservice/src/main/java/com/plannaplan/responses/models/ExchangeResponse.java b/restservice/src/main/java/com/plannaplan/responses/models/ExchangeResponse.java index fb02697..8e8d50a 100755 --- a/restservice/src/main/java/com/plannaplan/responses/models/ExchangeResponse.java +++ b/restservice/src/main/java/com/plannaplan/responses/models/ExchangeResponse.java @@ -27,7 +27,9 @@ public class ExchangeResponse { this.id = exchange.getId(); this.ownedAssignment = new GroupDefaultResponse(exchange.getOwnedAssignment().getGroup()); this.desiredGroup = new GroupDefaultResponse(exchange.getDesiredAssignment()); - this.courseName = exchange.getOwnedAssignment().getGroup().getCourseId().getName(); + this.courseName = exchange.getOwnedAssignment().getGroup().getCourseId() != null + ? exchange.getOwnedAssignment().getGroup().getCourseId().getName() + : ""; } /**