added null case #603