Index: TECH/Exceptions/Exception.cls.xml
===================================================================
diff -u -r2170 -r2524
--- TECH/Exceptions/Exception.cls.xml	(.../Exception.cls.xml)	(revision 2170)
+++ TECH/Exceptions/Exception.cls.xml	(.../Exception.cls.xml)	(revision 2524)
@@ -244,9 +244,21 @@
 <Method name="Rethrow">
 <FormalSpec>ExceptieType:%String,Omschrijving:%String=""</FormalSpec>
 <Implementation><![CDATA[
-	#dim Exception As TECH.Exceptions.BaseException = $classmethod(ExceptieType,"%New",Omschrijving)
-	do Exception.VoegToeInnerExceptie($this)
-	do ##class(TECH.ExceptionHandler).Throw(Exception)
+	#dim AnderExceptieTypeNodig As %Boolean = $$$False
+	If $IsObject(ExceptieType) && (ExceptieType.%ClassName(1) '= ..%ClassName(1)) {
+		Set AnderExceptieTypeNodig = $$$True
+	} ElseIf (ExceptieType '= ..%ClassName(1)) {
+		Set AnderExceptieTypeNodig = $$$True
+	}
+	
+	If AnderExceptieTypeNodig {
+		#dim Exception As TECH.Exceptions.BaseException = $classmethod(ExceptieType,"%New",Omschrijving)
+		do Exception.VoegToeInnerExceptie($this)
+		do ##class(TECH.ExceptionHandler).Throw(Exception)
+	} Else {
+		do ..VoegToeExtraInfo(Omschrijving)
+		do ##class(TECH.ExceptionHandler).Throw($this)
+	}
 ]]></Implementation>
 </Method>
 </Class>