Issue #39 - 'null' stripped out of contacts and groups