fix the matchers to handle null values #77