diff -r 80c46ea076d3 -r e2d1dc505c24 javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/PageProcessor.java --- a/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/PageProcessor.java Thu Apr 18 12:47:25 2013 +0200 +++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/PageProcessor.java Thu Apr 18 17:34:28 2013 +0200 @@ -246,7 +246,7 @@ w.append(type).append("(e));\n"); } else if (isEnum[0]) { w.append(" this.prop_").append(pn); - w.append(".add("); + w.append(".add(e == null ? null : "); w.append(type).append(".valueOf((String)e));\n"); } else { if (isPrimitive(type)) { @@ -262,7 +262,7 @@ } else { if (isEnum[0]) { w.append(" this.prop_").append(pn); - w.append(" = "); + w.append(" = ret[" + cnt + "] == null ? null : "); w.append(type).append(".valueOf((String)ret[" + cnt + "]);\n"); } else if (isPrimitive(type)) { w.append(" this.prop_").append(pn);