Added 404 url handling