Added in null check instead of empty string check.