Revert "Adding EOF exception handling"

This reverts commit 5873535354210744f6676e56228bf3f35b36433c.