Fix getAllContacts when an error occurs
Merge remote-tracking branch 'jonallengriffin/allcontacts'