SSP-2103 fixed for null case