Merge pull request #439 from yasserzamani/WW-5087master

WW-5087 handle Parameter.Empty properly