added errsafe and after