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 e5c3d1499eec868f60e7518112afc34e2dc65d43..87169eaead29c4830d581f4bbab612d746bcf68d 100644
--- a/appointment-import/src/main/java/smash/appointment/parse/Subject.java
+++ b/appointment-import/src/main/java/smash/appointment/parse/Subject.java
@@ -56,9 +56,9 @@ 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);
+		if (name != null && name.length() > 50) {
+			logger.warn("Name too long. Trimming: " + name);
+			name = name.substring(0, 50);
 		}
 		this.name = name;
 	}
@@ -77,9 +77,9 @@ 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);
+		if (surname != null && surname.length() > 50) {
+			logger.warn("Surname too long. Trimming: " + surname);
+			surname = surname.substring(0, 50);
 		}
 		this.surname = surname;
 	}
@@ -228,7 +228,12 @@ public class Subject {
 	 * @see #zipCode
 	 */
 	public void setZipCode(String zipCode) {
-		this.zipCode = zipCode;
+		if (zipCode != null && zipCode.length() > 50) {
+			logger.warn("Surname too long. Ignoring: " + zipCode);
+			zipCode = zipCode.substring(0, 50);
+		} else {
+			this.zipCode = zipCode;
+		}
 	}
 
 	/**