Added code to deal with null entries