Check for NULL aor_data
Make TestNonLocal test run on its own
Merge pull request #840 from Metaswitch/issue838

[Reviewer Graeme] Issue838