Fixed validation of empty URLs.
Merge origin/master