Added better Null support to matchers.