Added 404 error throwing