fixed potential null issue in operator matcher