Index: JBL FileHandler.prj.xml
===================================================================
diff -u -r2182 -r2223
--- JBL FileHandler.prj.xml	(.../JBL FileHandler.prj.xml)	(revision 2182)
+++ JBL FileHandler.prj.xml	(.../JBL FileHandler.prj.xml)	(revision 2223)
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
-<Project name="JBL FileHandler" LastModified="2011-09-26 17:14:06">
+<Project name="JBL FileHandler" LastModified="2011-09-27 14:14:18">
   <Items>
     <ProjectItem name="TECH.File.FileReader" type="CLS"/>
     <ProjectItem name="TECH.File.FileWriter" type="CLS"/>
-    <ProjectItem name="TECH.File.StreamHandler" type="CLS"/>
     <ProjectItem name="TECH.Lock" type="CLS"/>
     <ProjectItem name="TECH.enu.LockType" type="CLS"/>
     <ProjectItem name="vhUnitTest.TECH.File.dto.HoofdObject" type="CLS"/>
Index: TECH/File/FileWriter.cls.xml
===================================================================
diff -u -r2217 -r2223
--- TECH/File/FileWriter.cls.xml	(.../FileWriter.cls.xml)	(revision 2217)
+++ TECH/File/FileWriter.cls.xml	(.../FileWriter.cls.xml)	(revision 2223)
@@ -72,16 +72,29 @@
 <Implementation><![CDATA[
 	Set $ZTRAP = "Catch"
 	Set Filename = ..FileCharacterStream.Filename
-	Do ..FileCharacterStream.SaveStream()
-	Do ..FileCharacterStream.%Close()
+	
+	/// Save Stream
+	Set Status = ..FileCharacterStream.SaveStream()
+	If ($$$ISERR(Status)){
+		Set Exception = ##class(TECH.Exceptions.FileException).%New("Bestand kon niet worden gesaved '"_Filename_"'",Status)
+		Do ##class(TECH.ExceptionHandler).Throw(Exception)	
+	}
+	
+	/// Close stream
+	Set Status = ..FileCharacterStream.%Close()
+	If ($$$ISERR(Status)){
+		Set Exception = ##class(TECH.Exceptions.FileException).%New("Bestand kon niet worden gesloten '"_Filename_"'",Status)
+		Do ##class(TECH.ExceptionHandler).Throw(Exception)	
+	}
+	
 	/// Bestand kopieren indien WriteImmediate niet aan stond.
 	/// Handig voor snelheid bij wegschrijven naar netwerklocatie
 	If ('..WriteImmediate){
 		Set Gelukt = ##class(%File).CopyFile(Filename,..Bestand)		
 		If (Gelukt){
 			Set DeleteGelukt = ##class(TECH.File).Delete(Filename)
 			If (DeleteGelukt){
-				Set Exception = ##class(TECH.Exceptions.FileException).%New("Bestand kon niet worden verwijdert '"_Filename_"'",0)
+				Set Exception = ##class(TECH.Exceptions.FileException).%New("Bestand kon niet worden verwijderd '"_Filename_"'",0)
 				Do ##class(TECH.ExceptionHandler).Throw(Exception)	
 			}			
 		}Else{