Add proper check for url/args