better handling of null entry