Added nullptr CHECK for brute force matching

Change-Id: I3d164addd52ddf30aefda10c5a809be172e19fdb
Merge "Added nullptr CHECK for brute force matching"