added url safeguard