Add extra check before serving URLs