Fix for null issue

This just checks that the match is true