added an extra check to verify className is not null and contains a valid string
added an extra check to verify className is not null and contains a valid string

dperini/nwmatcher,dperini/nwmatcher,dperini/nwmatcher