Added null check in assertCurrentActivity
Added null check in getNumberOfMatches
Always return the total amount of matches in getNumberOfMatches