Check for buffer EOF in scanner

Check for buffer EOF in scanner #986