Fixed bug with empty url check
Merge branch 'kandan-176'