removed the special error handling