Added 404 error support