Bugfix
More case handling for nice EOF errors.