Bug 1380 - Fix NullPointerException when match is null

Change-Id: I728a90054642302d3157e1da4bfa7df3fb63087d
Signed-off-by: Rob Adams <readams@readams.net>
Merge "Bug 1380 - Fix NullPointerException when match is null"