diff --git a/MsBinaryFile/DocFile/DocumentMapping.cpp b/MsBinaryFile/DocFile/DocumentMapping.cpp
index f8745eba5b..11e47c152d 100644
--- a/MsBinaryFile/DocFile/DocumentMapping.cpp
+++ b/MsBinaryFile/DocFile/DocumentMapping.cpp
@@ -383,7 +383,7 @@ namespace DocFileFormat
 		RELEASEOBJECT(chpxFcs);
 		RELEASEOBJECT(chpxs);
 		
-		return cpEnd++;
+		return cpEnd;
 
 		return (std::max)(cp, cpEnd); //ralph_scovile.doc
 	}
diff --git a/OOXML/Binary/Presentation/BinaryFileReaderWriter.cpp b/OOXML/Binary/Presentation/BinaryFileReaderWriter.cpp
index 514a047328..855f13e9a9 100644
--- a/OOXML/Binary/Presentation/BinaryFileReaderWriter.cpp
+++ b/OOXML/Binary/Presentation/BinaryFileReaderWriter.cpp
@@ -1349,11 +1349,14 @@ namespace NSBinPptxRW
 	{
 		if (m_lPosition > 0)
 		{
-			CFileBinary::WriteFile(m_pStreamData, m_lPosition);
+			bool result = CFileBinary::WriteFile(m_pStreamData, m_lPosition);
+			if (result)
+			{
+				m_lPositionFlushed += m_lPosition;
+				m_lPosition = 0;
+				m_pStreamCur = m_pStreamData;
+			}
 		}
-		m_lPositionFlushed += m_lPosition;
-		m_lPosition = 0;
-		m_pStreamCur = m_pStreamData;
 	}
 	void CStreamBinaryWriter::WriteReserved(size_t lCount)
 	{