diff --git a/src/BeSimple/SoapClient/Curl.php b/src/BeSimple/SoapClient/Curl.php
index 5789853..38bc066 100644
--- a/src/BeSimple/SoapClient/Curl.php
+++ b/src/BeSimple/SoapClient/Curl.php
@@ -15,7 +15,7 @@ namespace BeSimple\SoapClient;
 /**
  * cURL wrapper class for doing HTTP requests that uses the soap class options.
  *
- * @author Andreas Schamberger
+ * @author Andreas Schamberger <mail@andreass.net>
  */
 class Curl
 {
diff --git a/src/BeSimple/SoapClient/Helper.php b/src/BeSimple/SoapClient/Helper.php
index bf261a0..e22afb9 100644
--- a/src/BeSimple/SoapClient/Helper.php
+++ b/src/BeSimple/SoapClient/Helper.php
@@ -17,7 +17,7 @@ namespace BeSimple\SoapClient;
  * server implementations. It also provides namespace and configuration
  * constants.
  *
- * @author Andreas Schamberger
+ * @author Andreas Schamberger <mail@andreass.net>
  */
 class Helper
 {
@@ -136,13 +136,6 @@ class Helper
      */
     const PFX_XOP = 'xop';
 
-    /**
-     * Wheather to format the XML output or not.
-     *
-     * @var boolean
-     */
-    public static $formatXmlOutput = false;
-
     /**
      * Generate a pseudo-random version 4 UUID.
      *
diff --git a/src/BeSimple/SoapClient/SoapClient.php b/src/BeSimple/SoapClient/SoapClient.php
index 86444da..75c930e 100644
--- a/src/BeSimple/SoapClient/SoapClient.php
+++ b/src/BeSimple/SoapClient/SoapClient.php
@@ -18,7 +18,7 @@ namespace BeSimple\SoapClient;
  * adds NTLM support. A custom WSDL downloader resolves remote xsd:includes and
  * allows caching of all remote referenced items.
  *
- * @author Andreas Schamberger
+ * @author Andreas Schamberger <mail@andreass.net>
  */
 class SoapClient extends \SoapClient
 {
@@ -75,8 +75,6 @@ class SoapClient extends \SoapClient
     {
         // we want the exceptions option to be set
         $options['exceptions'] = true;
-        // set custom error handler that converts all php errors to ErrorExceptions
-        Helper::setCustomErrorHandler();
         // we want to make sure we have the soap version to rely on it later
         if (!isset($options['soap_version'])) {
             $options['soap_version'] = SOAP_1_1;
diff --git a/src/BeSimple/SoapClient/WsdlDownloader.php b/src/BeSimple/SoapClient/WsdlDownloader.php
index 6406e2b..261fd50 100644
--- a/src/BeSimple/SoapClient/WsdlDownloader.php
+++ b/src/BeSimple/SoapClient/WsdlDownloader.php
@@ -18,7 +18,7 @@ namespace BeSimple\SoapClient;
  * ini settings. Does only file caching as SoapClient only supports a file
  * name parameter. The class also resolves remote XML schema includes.
  *
- * @author Andreas Schamberger
+ * @author Andreas Schamberger <mail@andreass.net>
  */
 class WsdlDownloader
 {
diff --git a/tests/BeSimple/Tests/SoapClient/CurlTest.php b/tests/BeSimple/Tests/SoapClient/CurlTest.php
index 928eae6..b940b2a 100644
--- a/tests/BeSimple/Tests/SoapClient/CurlTest.php
+++ b/tests/BeSimple/Tests/SoapClient/CurlTest.php
@@ -15,8 +15,8 @@ namespace BeSimple\SoapClient;
 use BeSimple\SoapClient\Curl;
 
 /**
-* @author Andreas Schamberger
-*/
+ * @author Andreas Schamberger <mail@andreass.net>
+ */
 class CurlTest extends \PHPUnit_Framework_TestCase
 {
     protected $webserverProcessId;
diff --git a/tests/BeSimple/Tests/SoapClient/WsdlDownloaderTest.php b/tests/BeSimple/Tests/SoapClient/WsdlDownloaderTest.php
index 09ec14c..326a668 100644
--- a/tests/BeSimple/Tests/SoapClient/WsdlDownloaderTest.php
+++ b/tests/BeSimple/Tests/SoapClient/WsdlDownloaderTest.php
@@ -15,8 +15,8 @@ namespace BeSimple\SoapClient;
 use BeSimple\SoapClient\WsdlDownloader;
 
 /**
-* @author Andreas Schamberger
-*/
+ * @author Andreas Schamberger <mail@andreass.net>
+ */
 class WsdlDownloaderTest extends \PHPUnit_Framework_TestCase
 {
     protected $webserverProcessId;