- improved scan error handling