1 files changed, 20 insertions, 3 deletions

diff --git a/src/tafreader.cpp b/src/tafreader.cpp
index 7bb0933..4408cce 100644
--- a/src/tafreader.cpp
+++ b/src/tafreader.cpp
@@ -209,15 +209,32 @@ void Bu::TafReader::next()
                 iCol++;
         if( c == '}' )
         {
-                sIn.read( &c, 1 );
+                rawread( &c );
                 if( c != '}' )
-                        sIn.read( &la, 1 );
+                        rawread( &la );
         }
         else
         {
                 c = la;
                 if( c != '}' )
-                        sIn.read( &la, 1 );
+                        rawread( &la );
+        }
+}
+
+void Bu::TafReader::rawread( char *c )
+{
+        if( sIn.read( c, 1 ) < 1 )
+        {
+                if( sIn.isEOS() )
+                {
+                        throw TafException("%d:%d: Premature end of stream.",
+                                iLine, iCol, c );
+                }
+                else
+                {
+                        throw TafException("%d:%d: No data read, but not end of stream?",
+                                iLine, iCol, c );
+                }
         }
 }