Merge branch 'master' of http://git.syncroton.org/Syncroton into SyncrotnMerge

Conflicts:
	scripts/packaging/debian/control

diff --combined tine20/library/Syncroton/lib/Syncroton/Server.php
index a938ffb,ab41628..ab41628
--- 1/tine20/library/Syncroton/lib/Syncroton/Server.php
--- 2/lib/Syncroton/Server.php
+++ b/tine20/library/Syncroton/lib/Syncroton/Server.php
@@@ -181,7 -181,19 +181,19 @@@ class Syncroton_Serve
              $outputStream = fopen("php://temp", 'r+');
              
              $encoder = new Syncroton_Wbxml_Encoder($outputStream, 'UTF-8', 3);
-             $encoder->encode($response);
+             
+             try {
+                  $encoder->encode($response);
+             } catch (Syncroton_Wbxml_Exception $swe) {
+                 if ($this->_logger instanceof Zend_Log) {
+                     $this->_logger->err(__METHOD__ . '::' . __LINE__ . " Could not encode output: " . $swe);
+                     $this->_logger->err(__METHOD__ . '::' . __LINE__ . " xml response:\n" . $response->saveXML());
+                 }
+                 
+                 header("HTTP/1.1 500 Internal server error");
+                 
+                 return;
+             }
              
              if ($requestParameters['acceptMultipart'] == true) {
                  $parts = $command->getParts();