Changed some null string checks to use String.IsNullOrEmpty()