Official Data Matches: null checks (fixes #35)