Fix for showing "null" in the edit text filed