Refine previous fix; do not die on EOF, but properly react to outright errors