Fix NPE when JSF nulled our lists