Non static match condition

Review PR
Doesn't seem to return default match condition if match condition is null.