applied Jukka's patch preventing some cornercases and making the EOF error message...