Fix null Persistable handling