Handle empty / null strings