tried to fix null pointer errors
Merge branch 'master' of https://github.com/leorayo/addressbook