More error handling in reader