diff --git a/persist/src/main/java/lcsb/mapviewer/persist/ObjectValidator.java b/persist/src/main/java/lcsb/mapviewer/persist/ObjectValidator.java
index 5b4fca287c6dde375253385b8a458eec64b08a61..e53db6c07f14e5a1627514edbae5555866a68903 100644
--- a/persist/src/main/java/lcsb/mapviewer/persist/ObjectValidator.java
+++ b/persist/src/main/java/lcsb/mapviewer/persist/ObjectValidator.java
@@ -205,12 +205,14 @@ public class ObjectValidator {
         @Override
         public void doWith(final Field arg0) {
           try {
+            // skip static
+            if (java.lang.reflect.Modifier.isStatic(arg0.getModifiers())) {
+              return;
+            }
             arg0.setAccessible(true);
             Object property = arg0.get(object);
             if (isIgnoredClass(arg0.getType())) {
               // skip
-            } else if (java.lang.reflect.Modifier.isStatic(arg0.getModifiers())) {
-              // skip static
             } else if (property == null
                 || property instanceof String
                 || property instanceof Double
diff --git a/persist/src/test/java/lcsb/mapviewer/persist/ObjectValidatorTest.java b/persist/src/test/java/lcsb/mapviewer/persist/ObjectValidatorTest.java
index e25b871b42fff0398aa98b51c48f516feafac41e..31d22ede7075f06efc15df2f162b48445b7fa055 100644
--- a/persist/src/test/java/lcsb/mapviewer/persist/ObjectValidatorTest.java
+++ b/persist/src/test/java/lcsb/mapviewer/persist/ObjectValidatorTest.java
@@ -3,6 +3,7 @@ package lcsb.mapviewer.persist;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
+import java.awt.geom.Line2D;
 import java.util.List;
 
 import org.junit.Test;
@@ -61,4 +62,11 @@ public class ObjectValidatorTest extends PersistTestFunctions {
     assertNull(issues.get(0).getLeft());
   }
 
+  @Test
+  public void testLine2DValidation() throws Exception {
+    Line2D line = new Line2D.Double(1, 2, 3, 4);
+    List<Pair<Object, String>> issues = objectValidator.getValidationIssues(line);
+    assertEquals(0, issues.size());
+    assertEquals(0, getErrors().size());
+  }
 }