Fixed null String problem