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>