Update to latest, wrap errors in pre