Fix: Handling EOFError