improved handling of null label