* 9306 fix to keep consistent with old code

Checking String.Empty or Null