Merge "Report an error instead of waiting for EOS indefinitely in sf2."