Fix nil match crash