diff --git a/SystemTools.cxx b/SystemTools.cxx
index 8ed63159333c6af85f4bb8ec83923a085754cb56..3c19018633341100f4ddf51ee77f86323c53eca7 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -3959,10 +3959,11 @@ bool SystemTools::GetLineFromStream(kwsys_ios::istream& is,
   line = "";
 
   long leftToRead = sizeLimit;
-  
+
   // If no characters are read from the stream, the end of file has
   // been reached.  Clear the fail bit just before reading.
-  while(!haveNewline &&
+  while(is &&
+        !haveNewline &&
         leftToRead != 0 &&
         (is.clear(is.rdstate() & ~kwsys_ios::ios::failbit),
          is.getline(buffer, bufferSize), is.gcount() > 0))
diff --git a/kwsysDateStamp.cmake b/kwsysDateStamp.cmake
index c6af273bdb2b486f996c941d58d0386182507091..313557936ed3874105c3aa2fc6f659f6a93995e3 100644
--- a/kwsysDateStamp.cmake
+++ b/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@ SET(KWSYS_DATE_STAMP_YEAR  2009)
 SET(KWSYS_DATE_STAMP_MONTH 10)
 
 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   09)
+SET(KWSYS_DATE_STAMP_DAY   16)