more changes for errors