Can you please use EMPTY_STRING rather than null?