bug fix - handling null