Guard against possible crash in complex concordance tool

Change-Id: Ibe70ed1996af4768da970e298642b0e5e1fba587