fixed matching nullpointer