diff --git a/appointment-import/src/main/java/smash/appointment/parse/Subject.java b/appointment-import/src/main/java/smash/appointment/parse/Subject.java
index 1b176e6a755772b90f4e7b9808dbdffca837e580..e5c3d1499eec868f60e7518112afc34e2dc65d43 100644
--- a/appointment-import/src/main/java/smash/appointment/parse/Subject.java
+++ b/appointment-import/src/main/java/smash/appointment/parse/Subject.java
@@ -36,10 +36,10 @@ public class Subject {
 	private List<String> languages = new ArrayList<>();
 
 	public Subject(String name, String surname, String ndNumber, String screeningNumber) {
-		this.name = name;
-		this.surname = surname;
-		this.ndNumber = ndNumber;
-		this.screeningNumber = screeningNumber;
+		this.setName(name);
+		this.setSurname(surname);
+		this.setNdNumber(ndNumber);
+		this.setScreeningNumber(screeningNumber);
 	}
 
 	/**
@@ -56,6 +56,10 @@ public class Subject {
 	 * @see #name
 	 */
 	public void setName(String name) {
+		if (name!=null && name.length()>50) {
+			logger.warn("Name too long. Trimming: "+name);
+			name = name.substring(0,50);
+		}
 		this.name = name;
 	}
 
@@ -73,6 +77,10 @@ public class Subject {
 	 * @see #surname
 	 */
 	public void setSurname(String surname) {
+		if (surname!=null && surname.length()>50) {
+			logger.warn("Surname too long. Trimming: "+name);
+			surname = surname.substring(0,50);
+		}
 		this.surname = surname;
 	}