Added 404 errors treatment