Added url checking
Added url checking