Added 404 and 500