diff --git a/lib/delphi/src/Thrift.Exception.pas b/lib/delphi/src/Thrift.Exception.pas
new file mode 100644
index 0000000..5d15c36
--- /dev/null
+++ b/lib/delphi/src/Thrift.Exception.pas
@@ -0,0 +1,62 @@
+(*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *)
+
+{$SCOPEDENUMS ON}
+
+unit Thrift.Exception;
+
+interface
+
+uses
+  Classes, SysUtils;
+
+type
+  // base class for all Thrift exceptions
+  TException = class( SysUtils.Exception)
+  public
+    function Message : string;        // hide inherited property: allow read, but prevent accidental writes
+    procedure UpdateMessageProperty;  // update inherited message property with toString()
+  end;
+
+
+
+
+implementation
+
+{ TException }
+
+function TException.Message;
+// allow read (exception summary), but prevent accidental writes
+// read will return the exception summary
+begin
+  result := Self.ToString;
+end;
+
+procedure TException.UpdateMessageProperty;
+// Update the inherited Message property to better conform to standard behaviour.
+// Nice benefit: The IDE is now able to show the exception message again.
+begin
+  inherited Message := Self.ToString;  // produces a summary text
+end;
+
+
+
+
+end.
+
diff --git a/lib/delphi/src/Thrift.Protocol.pas b/lib/delphi/src/Thrift.Protocol.pas
index 24f6791..36509ca 100644
--- a/lib/delphi/src/Thrift.Protocol.pas
+++ b/lib/delphi/src/Thrift.Protocol.pas
@@ -27,6 +27,7 @@
   Classes,
   SysUtils,
   Contnrs,
+  Thrift.Exception,
   Thrift.Stream,
   Thrift.Collections,
   Thrift.Transport;
@@ -116,7 +117,7 @@
     function Append(const Value: IThriftContainer): TStringBuilder; overload;
   end;
 
-  TProtocolException = class( Exception )
+  TProtocolException = class( TException)
   public
     const // TODO(jensg): change into enum
       UNKNOWN = 0;
diff --git a/lib/delphi/src/Thrift.Transport.pas b/lib/delphi/src/Thrift.Transport.pas
index 4af65f9..997f406 100644
--- a/lib/delphi/src/Thrift.Transport.pas
+++ b/lib/delphi/src/Thrift.Transport.pas
@@ -39,6 +39,7 @@
     {$ENDIF}
   {$ENDIF}
   Thrift.Collections,
+  Thrift.Exception,
   Thrift.Utils,
   Thrift.Stream;
 
@@ -79,7 +80,7 @@
     procedure Flush; virtual;
   end;
 
-  TTransportException = class( Exception )
+  TTransportException = class( TException)
   public
     type
       TExceptionType = (
diff --git a/lib/delphi/src/Thrift.pas b/lib/delphi/src/Thrift.pas
index 6eca3c9..ddd4c11 100644
--- a/lib/delphi/src/Thrift.pas
+++ b/lib/delphi/src/Thrift.pas
@@ -22,15 +22,19 @@
 interface
 
 uses
-  SysUtils, Thrift.Protocol;
+  SysUtils,
+  Thrift.Exception,
+  Thrift.Protocol;
 
 const
   Version = '1.0.0-dev';
 
 type
+  TException = Thrift.Exception.TException; // compatibility alias
+
   TApplicationExceptionSpecializedClass = class of TApplicationExceptionSpecialized;
 
-  TApplicationException = class( SysUtils.Exception )
+  TApplicationException = class( TException)
   public
     type
 {$SCOPEDENUMS ON}
@@ -83,31 +87,9 @@
   TApplicationExceptionInvalidProtocol = class (TApplicationExceptionSpecialized);
   TApplicationExceptionUnsupportedClientType = class (TApplicationExceptionSpecialized);
 
-  // base class for IDL-generated exceptions
-  TException = class( SysUtils.Exception)
-  public
-    function Message : string;        // hide inherited property: allow read, but prevent accidental writes
-    procedure UpdateMessageProperty;  // update inherited message property with toString()
-  end;
 
 implementation
 
-{ TException }
-
-function TException.Message;
-// allow read (exception summary), but prevent accidental writes
-// read will return the exception summary
-begin
-  result := Self.ToString;
-end;
-
-procedure TException.UpdateMessageProperty;
-// Update the inherited Message property to better conform to standard behaviour.
-// Nice benefit: The IDE is now able to show the exception message again.
-begin
-  inherited Message := Self.ToString;  // produces a summary text
-end;
-
 { TApplicationException }
 
 function TApplicationException.GetType: TExceptionType;
diff --git a/lib/delphi/test/client.dpr b/lib/delphi/test/client.dpr
index 1791c18..06dbd3d 100644
--- a/lib/delphi/test/client.dpr
+++ b/lib/delphi/test/client.dpr
@@ -29,6 +29,7 @@
   Thrift in '..\src\Thrift.pas',
   Thrift.Transport in '..\src\Thrift.Transport.pas',
   Thrift.Socket in '..\src\Thrift.Socket.pas',
+  Thrift.Exception in '..\src\Thrift.Exception.pas',
   Thrift.Transport.Pipes in '..\src\Thrift.Transport.Pipes.pas',
   Thrift.Protocol in '..\src\Thrift.Protocol.pas',
   Thrift.Protocol.JSON in '..\src\Thrift.Protocol.JSON.pas',
diff --git a/lib/delphi/test/multiplexed/Multiplex.Test.Client.dpr b/lib/delphi/test/multiplexed/Multiplex.Test.Client.dpr
index 14d6431..4278d8f 100644
--- a/lib/delphi/test/multiplexed/Multiplex.Test.Client.dpr
+++ b/lib/delphi/test/multiplexed/Multiplex.Test.Client.dpr
@@ -27,6 +27,7 @@
   Multiplex.Client.Main in 'Multiplex.Client.Main.pas',
   Thrift in '..\..\src\Thrift.pas',
   Thrift.Socket in '..\..\src\Thrift.Socket.pas',
+  Thrift.Exception in '..\..\src\Thrift.Exception.pas',
   Thrift.Transport in '..\..\src\Thrift.Transport.pas',
   Thrift.Transport.Pipes in '..\..\src\Thrift.Transport.Pipes.pas',
   Thrift.Protocol in '..\..\src\Thrift.Protocol.pas',
diff --git a/lib/delphi/test/multiplexed/Multiplex.Test.Server.dpr b/lib/delphi/test/multiplexed/Multiplex.Test.Server.dpr
index 0e51a9c..120462b 100644
--- a/lib/delphi/test/multiplexed/Multiplex.Test.Server.dpr
+++ b/lib/delphi/test/multiplexed/Multiplex.Test.Server.dpr
@@ -26,6 +26,7 @@
   Multiplex.Server.Main in 'Multiplex.Server.Main.pas',
   ConsoleHelper in '..\ConsoleHelper.pas',
   Thrift in '..\..\src\Thrift.pas',
+  Thrift.Exception in '..\..\src\Thrift.Exception.pas',
   Thrift.Socket in '..\..\src\Thrift.Socket.pas',
   Thrift.Transport in '..\..\src\Thrift.Transport.pas',
   Thrift.Transport.Pipes in '..\..\src\Thrift.Transport.Pipes.pas',
diff --git a/lib/delphi/test/serializer/TestSerializer.dpr b/lib/delphi/test/serializer/TestSerializer.dpr
index a621b7e..4360a73 100644
--- a/lib/delphi/test/serializer/TestSerializer.dpr
+++ b/lib/delphi/test/serializer/TestSerializer.dpr
@@ -24,6 +24,7 @@
 uses
   Classes, Windows, SysUtils, Generics.Collections,
   Thrift in '..\..\src\Thrift.pas',
+  Thrift.Exception in '..\..\src\Thrift.Exception.pas',
   Thrift.Socket in '..\..\src\Thrift.Socket.pas',
   Thrift.Transport in '..\..\src\Thrift.Transport.pas',
   Thrift.Protocol in '..\..\src\Thrift.Protocol.pas',
diff --git a/lib/delphi/test/server.dpr b/lib/delphi/test/server.dpr
index 9af8542..b5e48a6 100644
--- a/lib/delphi/test/server.dpr
+++ b/lib/delphi/test/server.dpr
@@ -27,6 +27,7 @@
   TestServerEvents in 'TestServerEvents.pas',
   Thrift.Test,  // in gen-delphi folder
   Thrift in '..\src\Thrift.pas',
+  Thrift.Exception in '..\src\Thrift.Exception.pas',
   Thrift.Transport in '..\src\Thrift.Transport.pas',
   Thrift.Socket in '..\src\Thrift.Socket.pas',
   Thrift.Transport.Pipes in '..\src\Thrift.Transport.Pipes.pas',
diff --git a/lib/delphi/test/skip/skiptest_version1.dpr b/lib/delphi/test/skip/skiptest_version1.dpr
index 219db6d..803d6bd 100644
--- a/lib/delphi/test/skip/skiptest_version1.dpr
+++ b/lib/delphi/test/skip/skiptest_version1.dpr
@@ -25,6 +25,7 @@
   Classes, Windows, SysUtils,
   Skiptest.One,
   Thrift in '..\..\src\Thrift.pas',
+  Thrift.Exception in '..\..\src\Thrift.Exception.pas',
   Thrift.Socket in '..\..\src\Thrift.Socket.pas',
   Thrift.Transport in '..\..\src\Thrift.Transport.pas',
   Thrift.Protocol in '..\..\src\Thrift.Protocol.pas',
diff --git a/lib/delphi/test/skip/skiptest_version2.dpr b/lib/delphi/test/skip/skiptest_version2.dpr
index e0c3111..633b247 100644
--- a/lib/delphi/test/skip/skiptest_version2.dpr
+++ b/lib/delphi/test/skip/skiptest_version2.dpr
@@ -25,6 +25,7 @@
   Classes, Windows, SysUtils,
   Skiptest.Two,
   Thrift in '..\..\src\Thrift.pas',
+  Thrift.Exception in '..\..\src\Thrift.Exception.pas',
   Thrift.Socket in '..\..\src\Thrift.Socket.pas',
   Thrift.Transport in '..\..\src\Thrift.Transport.pas',
   Thrift.Protocol in '..\..\src\Thrift.Protocol.pas',
diff --git a/lib/delphi/test/typeregistry/TestTypeRegistry.dpr b/lib/delphi/test/typeregistry/TestTypeRegistry.dpr
index 3a1fd2b..18a7c7d 100644
--- a/lib/delphi/test/typeregistry/TestTypeRegistry.dpr
+++ b/lib/delphi/test/typeregistry/TestTypeRegistry.dpr
@@ -25,6 +25,7 @@
   Classes, Windows, SysUtils, Generics.Collections, TypInfo,
   Thrift in '..\..\src\Thrift.pas',
   Thrift.Transport in '..\..\src\Thrift.Transport.pas',
+  Thrift.Exception in '..\..\src\Thrift.Exception.pas',
   Thrift.Socket in '..\..\src\Thrift.Socket.pas',
   Thrift.Protocol in '..\..\src\Thrift.Protocol.pas',
   Thrift.Protocol.JSON in '..\..\src\Thrift.Protocol.JSON.pas',
diff --git a/tutorial/delphi/DelphiClient/DelphiClient.dpr b/tutorial/delphi/DelphiClient/DelphiClient.dpr
index 0f380b0..74d0d45 100644
--- a/tutorial/delphi/DelphiClient/DelphiClient.dpr
+++ b/tutorial/delphi/DelphiClient/DelphiClient.dpr
@@ -26,7 +26,7 @@
   Generics.Collections,
   Thrift in '..\..\..\lib\delphi\src\Thrift.pas',
   Thrift.Collections in '..\..\..\lib\delphi\src\Thrift.Collections.pas',
-  Thrift.Console in '..\..\..\lib\delphi\src\Thrift.Console.pas',
+  Thrift.Exception in '..\..\..\lib\delphi\src\Thrift.Exception.pas',
   Thrift.Utils in '..\..\..\lib\delphi\src\Thrift.Utils.pas',
   Thrift.Stream in '..\..\..\lib\delphi\src\Thrift.Stream.pas',
   Thrift.Protocol in '..\..\..\lib\delphi\src\Thrift.Protocol.pas',
@@ -62,10 +62,10 @@
     transport.Open;
 
     client.ping;
-    Console.WriteLine('ping()');
+    WriteLn('ping()');
 
     sum := client.add( 1, 1);
-    Console.WriteLine( Format( '1+1=%d', [sum]));
+    WriteLn( Format( '1+1=%d', [sum]));
 
     work := TWorkImpl.Create;
 
@@ -74,11 +74,11 @@
     work.Num2 := 0;
     try
       quotient := client.calculate(1, work);
-      Console.WriteLine( 'Whoa we can divide by 0');
-      Console.WriteLine( Format('1/0=%d',[quotient]));
+      WriteLn( 'Whoa we can divide by 0');
+      WriteLn( Format('1/0=%d',[quotient]));
     except
       on io: TInvalidOperation
-      do Console.WriteLine( 'Invalid operation: ' + io.Why);
+      do WriteLn( 'Invalid operation: ' + io.Why);
     end;
 
     work.Op   := TOperation.SUBTRACT;
@@ -86,20 +86,20 @@
     work.Num2 := 10;
     try
       diff := client.calculate( 1, work);
-      Console.WriteLine( Format('15-10=%d', [diff]));
+      WriteLn( Format('15-10=%d', [diff]));
     except
       on io: TInvalidOperation
-      do Console.WriteLine( 'Invalid operation: ' + io.Why);
+      do WriteLn( 'Invalid operation: ' + io.Why);
     end;
 
     log := client.getStruct(1);
-    Console.WriteLine( Format( 'Check log: %s', [log.Value]));
+    WriteLn( Format( 'Check log: %s', [log.Value]));
 
     transport.Close();
 
   except
     on e : Exception
-    do Console.WriteLine( e.ClassName+': '+e.Message);
+    do WriteLn( e.ClassName+': '+e.Message);
   end;
 end;
 
diff --git a/tutorial/delphi/DelphiClient/DelphiClient.dproj b/tutorial/delphi/DelphiClient/DelphiClient.dproj
index 34aa533..ead7bce 100644
--- a/tutorial/delphi/DelphiClient/DelphiClient.dproj
+++ b/tutorial/delphi/DelphiClient/DelphiClient.dproj
@@ -1,119 +1,119 @@
-﻿    <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-        <PropertyGroup>
-            <ProjectGuid>{2B8FB3A1-2F9E-4883-8C53-0F56220B34F6}</ProjectGuid>
-            <MainSource>DelphiClient.dpr</MainSource>
-            <ProjectVersion>12.3</ProjectVersion>
-            <Basis>True</Basis>
-            <Config Condition="'$(Config)'==''">Debug</Config>
-            <Platform>Win32</Platform>
-            <AppType>Console</AppType>
-            <FrameworkType>None</FrameworkType>
-            <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
-        </PropertyGroup>
-        <PropertyGroup Condition="'$(Config)'=='Basis' or '$(Base)'!=''">
-            <Base>true</Base>
-        </PropertyGroup>
-        <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_1)'!=''">
-            <Cfg_1>true</Cfg_1>
-            <CfgParent>Base</CfgParent>
-            <Base>true</Base>
-        </PropertyGroup>
-        <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_2)'!=''">
-            <Cfg_2>true</Cfg_2>
-            <CfgParent>Base</CfgParent>
-            <Base>true</Base>
-        </PropertyGroup>
-        <PropertyGroup Condition="'$(Base)'!=''">
-            <DCC_UnitSearchPath>..\..\..\lib\delphi\src;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
-            <DCC_ImageBase>00400000</DCC_ImageBase>
-            <DCC_DcuOutput>.\dcu\$(Config)\$(Platform)</DCC_DcuOutput>
-            <DCC_UnitAlias>WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;$(DCC_UnitAlias)</DCC_UnitAlias>
-            <DCC_ExeOutput>..\bin\$(Config)\$(Platform)</DCC_ExeOutput>
-            <DCC_E>false</DCC_E>
-            <DCC_N>false</DCC_N>
-            <DCC_S>false</DCC_S>
-            <DCC_F>false</DCC_F>
-            <DCC_K>false</DCC_K>
-        </PropertyGroup>
-        <PropertyGroup Condition="'$(Cfg_1)'!=''">
-            <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
-            <DCC_Optimize>false</DCC_Optimize>
-            <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
-        </PropertyGroup>
-        <PropertyGroup Condition="'$(Cfg_2)'!=''">
-            <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
-            <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
-            <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
-            <DCC_DebugInformation>false</DCC_DebugInformation>
-        </PropertyGroup>
-        <ItemGroup>
-            <DelphiCompile Include="DelphiClient.dpr">
-                <MainSource>MainSource</MainSource>
-            </DelphiCompile>
-            <DCCReference Include="..\..\..\lib\delphi\src\Thrift.pas"/>
-            <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Collections.pas"/>
-            <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Console.pas"/>
-            <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Utils.pas"/>
-            <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Stream.pas"/>
-            <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Protocol.pas"/>
-            <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Server.pas"/>
-            <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Transport.pas"/>
-            <DCCReference Include="..\..\gen-delphi\Shared.pas"/>
-            <DCCReference Include="..\..\gen-delphi\Tutorial.pas"/>
-            <BuildConfiguration Include="Release">
-                <Key>Cfg_2</Key>
-                <CfgParent>Base</CfgParent>
-            </BuildConfiguration>
-            <BuildConfiguration Include="Basis">
-                <Key>Base</Key>
-            </BuildConfiguration>
-            <BuildConfiguration Include="Debug">
-                <Key>Cfg_1</Key>
-                <CfgParent>Base</CfgParent>
-            </BuildConfiguration>
-        </ItemGroup>
-        <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
-        <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
-        <ProjectExtensions>
-            <Borland.Personality>Delphi.Personality.12</Borland.Personality>
-            <Borland.ProjectType/>
-            <BorlandProject>
-                <Delphi.Personality>
-                    <VersionInfo>
-                        <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
-                        <VersionInfo Name="AutoIncBuild">False</VersionInfo>
-                        <VersionInfo Name="MajorVer">1</VersionInfo>
-                        <VersionInfo Name="MinorVer">0</VersionInfo>
-                        <VersionInfo Name="Release">0</VersionInfo>
-                        <VersionInfo Name="Build">0</VersionInfo>
-                        <VersionInfo Name="Debug">False</VersionInfo>
-                        <VersionInfo Name="PreRelease">False</VersionInfo>
-                        <VersionInfo Name="Special">False</VersionInfo>
-                        <VersionInfo Name="Private">False</VersionInfo>
-                        <VersionInfo Name="DLL">False</VersionInfo>
-                        <VersionInfo Name="Locale">1033</VersionInfo>
-                        <VersionInfo Name="CodePage">1252</VersionInfo>
-                    </VersionInfo>
-                    <VersionInfoKeys>
-                        <VersionInfoKeys Name="CompanyName"/>
-                        <VersionInfoKeys Name="FileDescription">Thrift Tutorial</VersionInfoKeys>
-                        <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
-                        <VersionInfoKeys Name="InternalName">DelphiClient</VersionInfoKeys>
-                        <VersionInfoKeys Name="LegalCopyright">Copyright © 2012 The Apache Software Foundation</VersionInfoKeys>
-                        <VersionInfoKeys Name="LegalTrademarks"/>
-                        <VersionInfoKeys Name="OriginalFilename">DelphiClient.exe</VersionInfoKeys>
-                        <VersionInfoKeys Name="ProductName">Thrift</VersionInfoKeys>
-                        <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
-                        <VersionInfoKeys Name="Comments"/>
-                    </VersionInfoKeys>
-                    <Source>
-                        <Source Name="MainSource">DelphiClient.dpr</Source>
-                    </Source>
-                </Delphi.Personality>
-                <Platforms>
-                    <Platform value="Win32">True</Platform>
-                </Platforms>
-            </BorlandProject>
-            <ProjectFileVersion>12</ProjectFileVersion>
-        </ProjectExtensions>
-    </Project>
+﻿	<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+		<PropertyGroup>
+			<ProjectGuid>{2B8FB3A1-2F9E-4883-8C53-0F56220B34F6}</ProjectGuid>
+			<MainSource>DelphiClient.dpr</MainSource>
+			<ProjectVersion>12.3</ProjectVersion>
+			<Basis>True</Basis>
+			<Config Condition="'$(Config)'==''">Debug</Config>
+			<Platform>Win32</Platform>
+			<AppType>Console</AppType>
+			<FrameworkType>None</FrameworkType>
+			<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+		</PropertyGroup>
+		<PropertyGroup Condition="'$(Config)'=='Basis' or '$(Base)'!=''">
+			<Base>true</Base>
+		</PropertyGroup>
+		<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_1)'!=''">
+			<Cfg_1>true</Cfg_1>
+			<CfgParent>Base</CfgParent>
+			<Base>true</Base>
+		</PropertyGroup>
+		<PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_2)'!=''">
+			<Cfg_2>true</Cfg_2>
+			<CfgParent>Base</CfgParent>
+			<Base>true</Base>
+		</PropertyGroup>
+		<PropertyGroup Condition="'$(Base)'!=''">
+			<DCC_UnitSearchPath>..\..\..\lib\delphi\src;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+			<DCC_ImageBase>00400000</DCC_ImageBase>
+			<DCC_DcuOutput>.\dcu\$(Config)\$(Platform)</DCC_DcuOutput>
+			<DCC_UnitAlias>WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;$(DCC_UnitAlias)</DCC_UnitAlias>
+			<DCC_ExeOutput>..\bin\$(Config)\$(Platform)</DCC_ExeOutput>
+			<DCC_E>false</DCC_E>
+			<DCC_N>false</DCC_N>
+			<DCC_S>false</DCC_S>
+			<DCC_F>false</DCC_F>
+			<DCC_K>false</DCC_K>
+		</PropertyGroup>
+		<PropertyGroup Condition="'$(Cfg_1)'!=''">
+			<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
+			<DCC_Optimize>false</DCC_Optimize>
+			<DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
+		</PropertyGroup>
+		<PropertyGroup Condition="'$(Cfg_2)'!=''">
+			<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
+			<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
+			<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+			<DCC_DebugInformation>false</DCC_DebugInformation>
+		</PropertyGroup>
+		<ItemGroup>
+			<DelphiCompile Include="DelphiClient.dpr">
+				<MainSource>MainSource</MainSource>
+			</DelphiCompile>
+			<DCCReference Include="..\..\..\lib\delphi\src\Thrift.pas"/>
+			<DCCReference Include="..\..\..\lib\delphi\src\Thrift.Collections.pas"/>
+			<DCCReference Include="..\..\..\lib\delphi\src\Thrift.Exception.pas"/>
+			<DCCReference Include="..\..\..\lib\delphi\src\Thrift.Utils.pas"/>
+			<DCCReference Include="..\..\..\lib\delphi\src\Thrift.Stream.pas"/>
+			<DCCReference Include="..\..\..\lib\delphi\src\Thrift.Protocol.pas"/>
+			<DCCReference Include="..\..\..\lib\delphi\src\Thrift.Server.pas"/>
+			<DCCReference Include="..\..\..\lib\delphi\src\Thrift.Transport.pas"/>
+			<DCCReference Include="..\..\gen-delphi\Shared.pas"/>
+			<DCCReference Include="..\..\gen-delphi\Tutorial.pas"/>
+			<BuildConfiguration Include="Release">
+				<Key>Cfg_2</Key>
+				<CfgParent>Base</CfgParent>
+			</BuildConfiguration>
+			<BuildConfiguration Include="Basis">
+				<Key>Base</Key>
+			</BuildConfiguration>
+			<BuildConfiguration Include="Debug">
+				<Key>Cfg_1</Key>
+				<CfgParent>Base</CfgParent>
+			</BuildConfiguration>
+		</ItemGroup>
+		<Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
+		<Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
+		<ProjectExtensions>
+			<Borland.Personality>Delphi.Personality.12</Borland.Personality>
+			<Borland.ProjectType/>
+			<BorlandProject>
+				<Delphi.Personality>
+					<VersionInfo>
+						<VersionInfo Name="IncludeVerInfo">True</VersionInfo>
+						<VersionInfo Name="AutoIncBuild">False</VersionInfo>
+						<VersionInfo Name="MajorVer">1</VersionInfo>
+						<VersionInfo Name="MinorVer">0</VersionInfo>
+						<VersionInfo Name="Release">0</VersionInfo>
+						<VersionInfo Name="Build">0</VersionInfo>
+						<VersionInfo Name="Debug">False</VersionInfo>
+						<VersionInfo Name="PreRelease">False</VersionInfo>
+						<VersionInfo Name="Special">False</VersionInfo>
+						<VersionInfo Name="Private">False</VersionInfo>
+						<VersionInfo Name="DLL">False</VersionInfo>
+						<VersionInfo Name="Locale">1033</VersionInfo>
+						<VersionInfo Name="CodePage">1252</VersionInfo>
+					</VersionInfo>
+					<VersionInfoKeys>
+						<VersionInfoKeys Name="CompanyName"/>
+						<VersionInfoKeys Name="FileDescription">Thrift Tutorial</VersionInfoKeys>
+						<VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
+						<VersionInfoKeys Name="InternalName">DelphiClient</VersionInfoKeys>
+						<VersionInfoKeys Name="LegalCopyright">Copyright © 2012 The Apache Software Foundation</VersionInfoKeys>
+						<VersionInfoKeys Name="LegalTrademarks"/>
+						<VersionInfoKeys Name="OriginalFilename">DelphiClient.exe</VersionInfoKeys>
+						<VersionInfoKeys Name="ProductName">Thrift</VersionInfoKeys>
+						<VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
+						<VersionInfoKeys Name="Comments"/>
+					</VersionInfoKeys>
+					<Source>
+						<Source Name="MainSource">DelphiClient.dpr</Source>
+					</Source>
+				</Delphi.Personality>
+				<Platforms>
+					<Platform value="Win32">True</Platform>
+				</Platforms>
+			</BorlandProject>
+			<ProjectFileVersion>12</ProjectFileVersion>
+		</ProjectExtensions>
+	</Project>
diff --git a/tutorial/delphi/DelphiServer/DelphiServer.dpr b/tutorial/delphi/DelphiServer/DelphiServer.dpr
index 9d54a2e..5f42e7e 100644
--- a/tutorial/delphi/DelphiServer/DelphiServer.dpr
+++ b/tutorial/delphi/DelphiServer/DelphiServer.dpr
@@ -28,7 +28,7 @@
   Generics.Collections,
   Thrift in '..\..\..\lib\delphi\src\Thrift.pas',
   Thrift.Collections in '..\..\..\lib\delphi\src\Thrift.Collections.pas',
-  Thrift.Console in '..\..\..\lib\delphi\src\Thrift.Console.pas',
+  Thrift.Exception in '..\..\..\lib\delphi\src\Thrift.Exception.pas',
   Thrift.Utils in '..\..\..\lib\delphi\src\Thrift.Utils.pas',
   Thrift.Stream in '..\..\..\lib\delphi\src\Thrift.Stream.pas',
   Thrift.Protocol in '..\..\..\lib\delphi\src\Thrift.Protocol.pas',
@@ -86,13 +86,13 @@
 
 procedure TCalculatorHandler.ping;
 begin
-  Console.WriteLine( 'ping()');
+  WriteLn( 'ping()');
 end;
 
 
 function TCalculatorHandler.add(num1: Integer; num2: Integer): Integer;
 begin
-  Console.WriteLine( Format( 'add( %d, %d)', [num1, num2]));
+  WriteLn( Format( 'add( %d, %d)', [num1, num2]));
   result := num1 + num2;
 end;
 
@@ -101,7 +101,7 @@
 var entry : ISharedStruct;
 begin
   try
-    Console.WriteLine( Format('calculate( %d, [%d,%d,%d])', [logid, Ord(w.Op), w.Num1, w.Num2]));
+    WriteLn( Format('calculate( %d, [%d,%d,%d])', [logid, Ord(w.Op), w.Num1, w.Num2]));
 
     case w.Op of
       TOperation.ADD      :  result := w.Num1 + w.Num2;
@@ -126,14 +126,14 @@
 
 function TCalculatorHandler.getStruct(key: Integer): ISharedStruct;
 begin
-  Console.WriteLine( Format( 'getStruct(%d)', [key]));
+  WriteLn( Format( 'getStruct(%d)', [key]));
   result := FLog[key];
 end;
 
 
 procedure TCalculatorHandler.zip;
 begin
-  Console.WriteLine( 'zip()');
+  WriteLn( 'zip()');
 end;
 
 
@@ -152,14 +152,14 @@
     transport := TServerSocketImpl.Create( 9090);
     server    := TSimpleServer.Create( processor, transport);
 
-    Console.WriteLine( 'Starting the server...');
+    WriteLn( 'Starting the server...');
     server.Serve();
 
   except
-    on e: Exception do Console.WriteLine( e.Message);
+    on e: Exception do WriteLn( e.Message);
   end;
 
-  Console.WriteLine('done.');
+  WriteLn('done.');
 end;
 
 
diff --git a/tutorial/delphi/DelphiServer/DelphiServer.dproj b/tutorial/delphi/DelphiServer/DelphiServer.dproj
index 74811bc..a26d952 100644
--- a/tutorial/delphi/DelphiServer/DelphiServer.dproj
+++ b/tutorial/delphi/DelphiServer/DelphiServer.dproj
@@ -1,118 +1,118 @@
-﻿    <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-        <PropertyGroup>
-            <ProjectGuid>{2B8FB3A1-2F9E-4883-8C53-0F56220B34F6}</ProjectGuid>
-            <MainSource>DelphiServer.dpr</MainSource>
-            <ProjectVersion>12.3</ProjectVersion>
-            <Basis>True</Basis>
-            <Config Condition="'$(Config)'==''">Debug</Config>
-            <Platform>Win32</Platform>
-            <AppType>Console</AppType>
-            <FrameworkType>None</FrameworkType>
-            <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
-        </PropertyGroup>
-        <PropertyGroup Condition="'$(Config)'=='Basis' or '$(Base)'!=''">
-            <Base>true</Base>
-        </PropertyGroup>
-        <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_1)'!=''">
-            <Cfg_1>true</Cfg_1>
-            <CfgParent>Base</CfgParent>
-            <Base>true</Base>
-        </PropertyGroup>
-        <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_2)'!=''">
-            <Cfg_2>true</Cfg_2>
-            <CfgParent>Base</CfgParent>
-            <Base>true</Base>
-        </PropertyGroup>
-        <PropertyGroup Condition="'$(Base)'!=''">
-            <DCC_ImageBase>00400000</DCC_ImageBase>
-            <DCC_DcuOutput>.\dcu\$(Config)\$(Platform)</DCC_DcuOutput>
-            <DCC_UnitAlias>WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;$(DCC_UnitAlias)</DCC_UnitAlias>
-            <DCC_ExeOutput>..\bin\$(Config)\$(Platform)</DCC_ExeOutput>
-            <DCC_E>false</DCC_E>
-            <DCC_N>false</DCC_N>
-            <DCC_S>false</DCC_S>
-            <DCC_F>false</DCC_F>
-            <DCC_K>false</DCC_K>
-        </PropertyGroup>
-        <PropertyGroup Condition="'$(Cfg_1)'!=''">
-            <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
-            <DCC_Optimize>false</DCC_Optimize>
-            <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
-        </PropertyGroup>
-        <PropertyGroup Condition="'$(Cfg_2)'!=''">
-            <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
-            <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
-            <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
-            <DCC_DebugInformation>false</DCC_DebugInformation>
-        </PropertyGroup>
-        <ItemGroup>
-            <DelphiCompile Include="DelphiServer.dpr">
-                <MainSource>MainSource</MainSource>
-            </DelphiCompile>
-            <DCCReference Include="..\..\..\lib\delphi\src\Thrift.pas"/>
-            <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Collections.pas"/>
-            <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Console.pas"/>
-            <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Utils.pas"/>
-            <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Stream.pas"/>
-            <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Protocol.pas"/>
-            <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Server.pas"/>
-            <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Transport.pas"/>
-            <DCCReference Include="..\..\gen-delphi\Shared.pas"/>
-            <DCCReference Include="..\..\gen-delphi\Tutorial.pas"/>
-            <BuildConfiguration Include="Release">
-                <Key>Cfg_2</Key>
-                <CfgParent>Base</CfgParent>
-            </BuildConfiguration>
-            <BuildConfiguration Include="Basis">
-                <Key>Base</Key>
-            </BuildConfiguration>
-            <BuildConfiguration Include="Debug">
-                <Key>Cfg_1</Key>
-                <CfgParent>Base</CfgParent>
-            </BuildConfiguration>
-        </ItemGroup>
-        <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
-        <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
-        <ProjectExtensions>
-            <Borland.Personality>Delphi.Personality.12</Borland.Personality>
-            <Borland.ProjectType/>
-            <BorlandProject>
-                <Delphi.Personality>
-                    <VersionInfo>
-                        <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
-                        <VersionInfo Name="AutoIncBuild">False</VersionInfo>
-                        <VersionInfo Name="MajorVer">1</VersionInfo>
-                        <VersionInfo Name="MinorVer">0</VersionInfo>
-                        <VersionInfo Name="Release">0</VersionInfo>
-                        <VersionInfo Name="Build">0</VersionInfo>
-                        <VersionInfo Name="Debug">False</VersionInfo>
-                        <VersionInfo Name="PreRelease">False</VersionInfo>
-                        <VersionInfo Name="Special">False</VersionInfo>
-                        <VersionInfo Name="Private">False</VersionInfo>
-                        <VersionInfo Name="DLL">False</VersionInfo>
-                        <VersionInfo Name="Locale">1033</VersionInfo>
-                        <VersionInfo Name="CodePage">1252</VersionInfo>
-                    </VersionInfo>
-                    <VersionInfoKeys>
-                        <VersionInfoKeys Name="CompanyName"/>
-                        <VersionInfoKeys Name="FileDescription">Thrift Tutorial</VersionInfoKeys>
-                        <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
-                        <VersionInfoKeys Name="InternalName">DelphiServer</VersionInfoKeys>
-                        <VersionInfoKeys Name="LegalCopyright">Copyright © 2012 The Apache Software Foundation</VersionInfoKeys>
-                        <VersionInfoKeys Name="LegalTrademarks"/>
-                        <VersionInfoKeys Name="OriginalFilename">DelphiServer.exe</VersionInfoKeys>
-                        <VersionInfoKeys Name="ProductName">Thrift</VersionInfoKeys>
-                        <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
-                        <VersionInfoKeys Name="Comments"/>
-                    </VersionInfoKeys>
-                    <Source>
-                        <Source Name="MainSource">DelphiServer.dpr</Source>
-                    </Source>
-                </Delphi.Personality>
-                <Platforms>
-                    <Platform value="Win32">True</Platform>
-                </Platforms>
-            </BorlandProject>
-            <ProjectFileVersion>12</ProjectFileVersion>
-        </ProjectExtensions>
-    </Project>
+﻿	<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+		<PropertyGroup>
+			<ProjectGuid>{2B8FB3A1-2F9E-4883-8C53-0F56220B34F6}</ProjectGuid>
+			<MainSource>DelphiServer.dpr</MainSource>
+			<ProjectVersion>12.3</ProjectVersion>
+			<Basis>True</Basis>
+			<Config Condition="'$(Config)'==''">Debug</Config>
+			<Platform>Win32</Platform>
+			<AppType>Console</AppType>
+			<FrameworkType>None</FrameworkType>
+			<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+		</PropertyGroup>
+		<PropertyGroup Condition="'$(Config)'=='Basis' or '$(Base)'!=''">
+			<Base>true</Base>
+		</PropertyGroup>
+		<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_1)'!=''">
+			<Cfg_1>true</Cfg_1>
+			<CfgParent>Base</CfgParent>
+			<Base>true</Base>
+		</PropertyGroup>
+		<PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_2)'!=''">
+			<Cfg_2>true</Cfg_2>
+			<CfgParent>Base</CfgParent>
+			<Base>true</Base>
+		</PropertyGroup>
+		<PropertyGroup Condition="'$(Base)'!=''">
+			<DCC_ImageBase>00400000</DCC_ImageBase>
+			<DCC_DcuOutput>.\dcu\$(Config)\$(Platform)</DCC_DcuOutput>
+			<DCC_UnitAlias>WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;$(DCC_UnitAlias)</DCC_UnitAlias>
+			<DCC_ExeOutput>..\bin\$(Config)\$(Platform)</DCC_ExeOutput>
+			<DCC_E>false</DCC_E>
+			<DCC_N>false</DCC_N>
+			<DCC_S>false</DCC_S>
+			<DCC_F>false</DCC_F>
+			<DCC_K>false</DCC_K>
+		</PropertyGroup>
+		<PropertyGroup Condition="'$(Cfg_1)'!=''">
+			<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
+			<DCC_Optimize>false</DCC_Optimize>
+			<DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
+		</PropertyGroup>
+		<PropertyGroup Condition="'$(Cfg_2)'!=''">
+			<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
+			<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
+			<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+			<DCC_DebugInformation>false</DCC_DebugInformation>
+		</PropertyGroup>
+		<ItemGroup>
+			<DelphiCompile Include="DelphiServer.dpr">
+				<MainSource>MainSource</MainSource>
+			</DelphiCompile>
+			<DCCReference Include="..\..\..\lib\delphi\src\Thrift.pas"/>
+			<DCCReference Include="..\..\..\lib\delphi\src\Thrift.Collections.pas"/>
+			<DCCReference Include="..\..\..\lib\delphi\src\Thrift.Exception.pas"/>
+			<DCCReference Include="..\..\..\lib\delphi\src\Thrift.Utils.pas"/>
+			<DCCReference Include="..\..\..\lib\delphi\src\Thrift.Stream.pas"/>
+			<DCCReference Include="..\..\..\lib\delphi\src\Thrift.Protocol.pas"/>
+			<DCCReference Include="..\..\..\lib\delphi\src\Thrift.Server.pas"/>
+			<DCCReference Include="..\..\..\lib\delphi\src\Thrift.Transport.pas"/>
+			<DCCReference Include="..\..\gen-delphi\Shared.pas"/>
+			<DCCReference Include="..\..\gen-delphi\Tutorial.pas"/>
+			<BuildConfiguration Include="Release">
+				<Key>Cfg_2</Key>
+				<CfgParent>Base</CfgParent>
+			</BuildConfiguration>
+			<BuildConfiguration Include="Basis">
+				<Key>Base</Key>
+			</BuildConfiguration>
+			<BuildConfiguration Include="Debug">
+				<Key>Cfg_1</Key>
+				<CfgParent>Base</CfgParent>
+			</BuildConfiguration>
+		</ItemGroup>
+		<Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
+		<Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
+		<ProjectExtensions>
+			<Borland.Personality>Delphi.Personality.12</Borland.Personality>
+			<Borland.ProjectType/>
+			<BorlandProject>
+				<Delphi.Personality>
+					<VersionInfo>
+						<VersionInfo Name="IncludeVerInfo">True</VersionInfo>
+						<VersionInfo Name="AutoIncBuild">False</VersionInfo>
+						<VersionInfo Name="MajorVer">1</VersionInfo>
+						<VersionInfo Name="MinorVer">0</VersionInfo>
+						<VersionInfo Name="Release">0</VersionInfo>
+						<VersionInfo Name="Build">0</VersionInfo>
+						<VersionInfo Name="Debug">False</VersionInfo>
+						<VersionInfo Name="PreRelease">False</VersionInfo>
+						<VersionInfo Name="Special">False</VersionInfo>
+						<VersionInfo Name="Private">False</VersionInfo>
+						<VersionInfo Name="DLL">False</VersionInfo>
+						<VersionInfo Name="Locale">1033</VersionInfo>
+						<VersionInfo Name="CodePage">1252</VersionInfo>
+					</VersionInfo>
+					<VersionInfoKeys>
+						<VersionInfoKeys Name="CompanyName"/>
+						<VersionInfoKeys Name="FileDescription">Thrift Tutorial</VersionInfoKeys>
+						<VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
+						<VersionInfoKeys Name="InternalName">DelphiServer</VersionInfoKeys>
+						<VersionInfoKeys Name="LegalCopyright">Copyright © 2012 The Apache Software Foundation</VersionInfoKeys>
+						<VersionInfoKeys Name="LegalTrademarks"/>
+						<VersionInfoKeys Name="OriginalFilename">DelphiServer.exe</VersionInfoKeys>
+						<VersionInfoKeys Name="ProductName">Thrift</VersionInfoKeys>
+						<VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
+						<VersionInfoKeys Name="Comments"/>
+					</VersionInfoKeys>
+					<Source>
+						<Source Name="MainSource">DelphiServer.dpr</Source>
+					</Source>
+				</Delphi.Personality>
+				<Platforms>
+					<Platform value="Win32">True</Platform>
+				</Platforms>
+			</BorlandProject>
+			<ProjectFileVersion>12</ProjectFileVersion>
+		</ProjectExtensions>
+	</Project>