Some changes to handle null string