Index: TECH/Ftp/impl/FtpAPI.cls.xml
===================================================================
diff -u -r2866 -r2961
--- TECH/Ftp/impl/FtpAPI.cls.xml	(.../FtpAPI.cls.xml)	(revision 2866)
+++ TECH/Ftp/impl/FtpAPI.cls.xml	(.../FtpAPI.cls.xml)	(revision 2961)
@@ -8,9 +8,16 @@
 <Private>1</Private>
 </Property>
 
+<Property name="Configuratie">
+<Type>TECH.Ftp.FtpConfiguratie</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="Connecteer">
 <FormalSpec>Configuratie:TECH.Ftp.FtpConfiguratie</FormalSpec>
 <Implementation><![CDATA[
+	Set ..Configuratie = Configuratie
+	
 	Set ..FtpSessie = ##class(%Net.FtpSession).%New()
 	Set ..FtpSessie.Timeout = Configuratie.Timeout	
 	
@@ -32,7 +39,7 @@
 <Implementation><![CDATA[
 	If '..FtpSessie.Logout() {
 		Do ##class(TECH.Exceptions.GeneralErrorException).Throw("Ftp afmelden is niet gelukt ! ")  
-		}
+	}
 ]]></Implementation>
 </Method>
 
@@ -49,7 +56,16 @@
 <FormalSpec>Stream:%Stream,ServerBestandsNaam:%String</FormalSpec>
 <Implementation><![CDATA[
 	if '..FtpSessie.Store(ServerBestandsNaam,Stream) {
-		Do ##class(TECH.Exceptions.GeneralErrorException).Throw("Ftp kan het bestand niet verzenden ! " _ServerBestandsNaam)
+		set Exception = ##class(TECH.Exceptions.GeneralErrorException).%New("Ftp kan het bestand niet verzenden ! ")
+		
+		do Exception.ExtraInfo.WriteLine("Configuratie :")
+		do Exception.ExtraInfo.WriteLine(..Configuratie.ToString())
+		do Exception.ExtraInfo.WriteLine("Bestandnaam : ")
+		do Exception.ExtraInfo.WriteLine(ServerBestandsNaam)
+		do Exception.ExtraInfo.WriteLine("Data : ")
+		do Exception.ExtraInfo.CopyFrom(Stream)
+		
+		Do ##class(TECH.ExceptionHandler).Throw(Exception)
 	}
 ]]></Implementation>
 </Method>
@@ -69,7 +85,7 @@
 	#dim FileArray As %ArrayOfDataTypes
 	If '..FtpSessie.NameList("",.FileArray) {
 		Do ##class(TECH.Exceptions.GeneralErrorException).Throw("Ftp kan bestandlijst niet opvragen ! ")
-		}
+	}
 	quit FileArray
 ]]></Implementation>
 </Method>
Index: TECH/Ftp/FtpConfiguratie.cls.xml
===================================================================
diff -u -r2852 -r2961
--- TECH/Ftp/FtpConfiguratie.cls.xml	(.../FtpConfiguratie.cls.xml)	(revision 2852)
+++ TECH/Ftp/FtpConfiguratie.cls.xml	(.../FtpConfiguratie.cls.xml)	(revision 2961)
@@ -44,6 +44,19 @@
 	Quit $$$OK
 ]]></Implementation>
 </Method>
+
+<Method name="ToString">
+<Implementation><![CDATA[
+	#dim String As %String = ""
+	set Iterator = ##class(TECH.ListIterator).%New(##class(Tools.ObjectDumper.DisplayDumper).%New($this).GetResult())
+	while Iterator.HasNext() {
+		#dim Line As %String = Iterator.Next()
+		if $$$StartsWith(Line,"Paswoord") set Line = "Paswoord = ************"
+		set String = String _ Line 	_ $$$CRLF
+	}
+	quit String
+]]></Implementation>
+</Method>
 </Class>