add check on addressbook save to avoid errors #417
Merge branch '3.2-populus'