diff --git a/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/CreateProjectPageViewModel.cs b/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/CreateProjectPageViewModel.cs
index 6917300..7ae1a2f 100644
--- a/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/CreateProjectPageViewModel.cs
+++ b/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/CreateProjectPageViewModel.cs
@@ -1,5 +1,6 @@
 using System.Collections.ObjectModel;
 using System.Threading.Tasks;
+using Windows.System.UserProfile;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Navigation;
@@ -36,6 +37,8 @@ public CreateProjectPageViewModel(IProjectService projectService, INavigationSer
 
 			this.Project = new Project()
 			{
+				Description = "Amazing new project. Touch Play button and try it out yourself. It's great!",
+				Author = "Unknown",
 				Files = new ObservableCollection<CodeFile>()
 				{
 					new Script()
diff --git a/SparkiyClient/SparkiyClient.UILogic/ViewModels/MainPageViewModel.cs b/SparkiyClient/SparkiyClient.UILogic/ViewModels/MainPageViewModel.cs
index 6e73210..d31f65a 100644
--- a/SparkiyClient/SparkiyClient.UILogic/ViewModels/MainPageViewModel.cs
+++ b/SparkiyClient/SparkiyClient.UILogic/ViewModels/MainPageViewModel.cs
@@ -21,6 +21,10 @@ public interface IMainPageViewModel : IViewModelBase
 	{
 		bool RequiresWorkspaceInitialization { get; }
 
+		TimeSpan NextReleaseCountdown { get; }
+
+		bool IsNextReleaseReady { get; }
+
 		ObservableCollection<Project> Projects { get; } 
 
 		RelayCommand InitializeWorkspaceCommand { get; }
@@ -40,6 +44,8 @@ public class MainPageViewModel : ExtendedViewModel, IMainPageViewModel
 	    private readonly IStorageService storageService;
 	    private readonly IProjectService projectService;
 
+	    private readonly DispatcherTimer nextReleaseCountdownTimer;
+
 
 	    public MainPageViewModel(INavigationService navigationService, IAlertMessageService alertMessageService, IStorageService storageService, IProjectService projectService)
 	    {
@@ -53,8 +59,14 @@ public MainPageViewModel(INavigationService navigationService, IAlertMessageServ
 			this.InitializeWorkspaceCommand = new RelayCommand(this.InitializeWorkspaceCommandExecuteAsync);
 			this.ProjectSelectedCommand = new RelayCommand<Project>(this.ProjectSelectedCommandExecute);
 			this.NewProjectCommand = new RelayCommand(this.NewProjectCommandExecute);
-	    }
 
+			this.NextReleaseCountdown = (new DateTime(2015, 1, 26, 0, 0, 0)) - DateTime.Now;
+			this.nextReleaseCountdownTimer = new DispatcherTimer();
+		    this.nextReleaseCountdownTimer.Interval = TimeSpan.FromSeconds(1);
+			this.nextReleaseCountdownTimer.Tick += NextReleaseCountdownTimerOnTick;
+			this.nextReleaseCountdownTimer.Start();
+		    this.NextReleaseCountdownTimerOnTick(null, null);
+	    }
 
 	    public override async void OnNavigatedTo(NavigationEventArgs e)
 	    {
@@ -67,7 +79,14 @@ public override async void OnNavigatedTo(NavigationEventArgs e)
 		    }
 	    }
 
-	    private async Task LoadProjectsAsync()
+		private void NextReleaseCountdownTimerOnTick(object sender, object o)
+		{
+			this.NextReleaseCountdown = NextReleaseCountdown - TimeSpan.FromSeconds(1);
+			if (NextReleaseCountdown.TotalSeconds <= 0)
+				this.IsNextReleaseReady = true;
+		}
+
+		private async Task LoadProjectsAsync()
 	    {
 			Log.Debug("Loading project...");
 		    if (this.storageService.RequiresHardStorageInitialization())
@@ -110,6 +129,18 @@ public bool RequiresWorkspaceInitialization
 			protected set { this.SetProperty(value); }
 		}
 
+	    public TimeSpan NextReleaseCountdown
+	    {
+		    get { return this.GetProperty<TimeSpan>(); }
+			protected set { this.SetProperty(value); }
+	    }
+
+		public bool IsNextReleaseReady
+		{
+			get { return this.GetProperty<bool>(); }
+			protected set { this.SetProperty(value); }
+		}
+
 		public RelayCommand InitializeWorkspaceCommand { get; }
 
 		public RelayCommand<Project> ProjectSelectedCommand { get; }
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/PlayView/PlayViewControl.xaml.cs b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/PlayView/PlayViewControl.xaml.cs
index 337b091..0e965cd 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/PlayView/PlayViewControl.xaml.cs
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/PlayView/PlayViewControl.xaml.cs
@@ -59,8 +59,6 @@ public void AssignProject(Project project)
 		    this.project = project;
 
 			this.RebuildEngine();
-
-			this.isInitialized = true;
 		}
 
 	    private void StopProject()
@@ -75,7 +73,7 @@ private void StopProject()
 
 	    public void PlayProject()
 	    {
-			if (this.IsPlaying)
+			if (!this.IsInitialized || this.IsPlaying)
 				return;
 
 			this.Engine.Play();
@@ -87,7 +85,7 @@ public void PlayProject()
 
 	    public void PauseProject()
 	    {
-		    if (this.IsPause)
+		    if (!this.IsInitialized || this.IsPause)
 			    return;
 
 			this.Engine.Pause();
@@ -138,8 +136,12 @@ private void RebuildEngine()
 			// TODO Add assets to the engine
 
 			// Add scripts to the engine
+			bool allScriptsValid = true;
 			foreach (var script in this.project.Files.OfType<Script>())
-				this.engine.AddScript(script.Name, classesCombined + script.Code);
+				allScriptsValid &= this.engine.AddScript(script.Name, classesCombined + script.Code);
+			if (!allScriptsValid)
+				this.isInitialized = false;
+			else this.isInitialized = true;
 		}
 
 	    public void TakeScreenshot()
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Converters/BooleanToBrushConverter.cs b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Converters/BooleanToBrushConverter.cs
new file mode 100644
index 0000000..cbf76b7
--- /dev/null
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Converters/BooleanToBrushConverter.cs
@@ -0,0 +1,30 @@
+using System;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Media;
+
+namespace SparkiyClient.Converters
+{
+	public class BooleanToBrushConverter : IValueConverter
+	{
+		public Brush TrueBrush { get; set; }
+
+		public Brush FalseBrush { get; set; }
+
+
+		public object Convert(object value, Type targetType, object parameter, string language)
+		{
+			if (value == null)
+				return FalseBrush;
+
+			if (!(value is bool))
+				throw new NotSupportedException();
+
+			return (bool) value ? TrueBrush : FalseBrush;
+		}
+
+		public object ConvertBack(object value, Type targetType, object parameter, string language)
+		{
+			throw new NotImplementedException();
+		}
+	}
+}
\ No newline at end of file
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Converters/StringFormatConverter.cs b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Converters/StringFormatConverter.cs
index de1fedd..bd98c38 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Converters/StringFormatConverter.cs
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Converters/StringFormatConverter.cs
@@ -6,9 +6,7 @@ public class StringFormatConverter : Windows.UI.Xaml.Data.IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, string language)
         {
-            string arg = System.Convert.ToString(value);
-
-            return string.Format((string)parameter, arg);
+            return string.Format((string)parameter, value);
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, string language)
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/SparkiyClient.Shared.projitems b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/SparkiyClient.Shared.projitems
index 4520bc2..4b0b5b8 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/SparkiyClient.Shared.projitems
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/SparkiyClient.Shared.projitems
@@ -58,6 +58,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\TopNavigationControl.xaml.cs">
       <DependentUpon>TopNavigationControl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Converters\BooleanToBrushConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Converters\BooleanToVisibilityConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Converters\StringFormatConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Services\AlertMessageService.cs" />
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Themes/ColorsDictionary.xaml b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Themes/ColorsDictionary.xaml
index 9a94eda..1c8ff7d 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Themes/ColorsDictionary.xaml
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Themes/ColorsDictionary.xaml
@@ -8,11 +8,14 @@
 	<Color x:Key="AccentColorGreen">#92CA45</Color>
 	<Color x:Key="AccentColorDark">#2F4750</Color>
 	<Color x:Key="AccentColorLight">#FFFFFF</Color>
+	<Color x:Key="AccentColorDarkLighter3">#F8F9F9</Color>
 	<SolidColorBrush x:Key="AccentBrushBlue" Color="{StaticResource AccentColorBlue}" />
 	<SolidColorBrush x:Key="AccentBrushRed" Color="{StaticResource AccentColorRed}" />
 	<SolidColorBrush x:Key="AccentBrushGreen" Color="{StaticResource AccentColorGreen}" />
 	<SolidColorBrush x:Key="AccentBrushDark" Color="{StaticResource AccentColorDark}" />
 	<SolidColorBrush x:Key="AccentBrushLight" Color="{StaticResource AccentColorLight}" />
+	<SolidColorBrush x:Key="AccentBrushDarkLighter3" Color="{StaticResource AccentColorDarkLighter3}" />
+	
 	
 	
 </ResourceDictionary>
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Views/MainPage.xaml b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Views/MainPage.xaml
index 771c222..a9e51c0 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Views/MainPage.xaml
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Views/MainPage.xaml
@@ -65,7 +65,7 @@
 			</SemanticZoom.ZoomedOutView>
 			
 			<SemanticZoom.ZoomedInView>
-				<Hub>
+				<Hub Background="{StaticResource AccentBrushDarkLighter3}" >
 					<Hub.Header>
 						<StackPanel Orientation="Horizontal">
 							<Grid Margin="5 0 20 0">
@@ -80,12 +80,14 @@
 					</Hub.Header>
 			
 					<!-- Content -->
-					<HubSection Width="780">
+					<HubSection Background="{StaticResource AccentBrushLight}" Width="780" VerticalContentAlignment="Stretch">
 						<DataTemplate>
 							<Grid>
 								<Grid.RowDefinitions>
 									<RowDefinition Height="Auto" />
 									<RowDefinition />
+									<RowDefinition Height="Auto" />
+									<RowDefinition Height="Auto" />
 								</Grid.RowDefinitions>
 						
 								<!-- Select workspace folder message -->
@@ -119,6 +121,31 @@
 												Grid.Column="2"/>
 									</Grid>
 								</Border>
+								
+								<Grid Grid.Row="2">
+									<Grid.Resources>
+										<Style TargetType="TextBlock" x:Key="TextBlockCountdownStyle">
+											<Setter Property="FontSize" Value="28" />
+											<Setter Property="FontWeight" Value="ExtraLight" />
+										</Style>
+									</Grid.Resources>
+									<StackPanel Orientation="Horizontal"
+												Visibility="{Binding IsNextReleaseReady, Converter={StaticResource NegatedBooleanToVisibilityConverter}}">
+										<TextBlock Text="Next release in" Style="{StaticResource TextBlockCountdownStyle}" Margin="0 0 20 0" />
+										<TextBlock Text="{Binding NextReleaseCountdown.Days, Converter={StaticResource StringFormatConverter}, ConverterParameter=\{0\:00\}}" Style="{StaticResource TextBlockCountdownStyle}" />
+										<TextBlock Text=":" Style="{StaticResource TextBlockCountdownStyle}" />
+										<TextBlock Text="{Binding NextReleaseCountdown.Hours, Converter={StaticResource StringFormatConverter}, ConverterParameter=\{0\:00\}}" Style="{StaticResource TextBlockCountdownStyle}" />
+										<TextBlock Text=":" Style="{StaticResource TextBlockCountdownStyle}" />
+										<TextBlock Text="{Binding NextReleaseCountdown.Minutes, Converter={StaticResource StringFormatConverter}, ConverterParameter=\{0\:00\}}" Style="{StaticResource TextBlockCountdownStyle}" />
+										<TextBlock Text=":" Style="{StaticResource TextBlockCountdownStyle}" />
+										<TextBlock Text="{Binding NextReleaseCountdown.Seconds, Converter={StaticResource StringFormatConverter}, ConverterParameter=\{0\:00\}}" Style="{StaticResource TextBlockCountdownStyle}" />
+									</StackPanel>
+									<TextBlock Text="New release will be available soon." 
+											   Style="{StaticResource TextBlockCountdownStyle}"
+											   Visibility="{Binding IsNextReleaseReady, Converter={StaticResource BooleanToVisibilityConverter}}" />
+								</Grid>
+								
+								<TextBlock Text="v1.3.0" FontSize="16" FontWeight="ExtraLight" Margin="0 4" Grid.Row="3" />
 							</Grid>
 						</DataTemplate>
 					</HubSection>
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Views/ProjectPage.xaml b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Views/ProjectPage.xaml
index 7a94c6e..c20b491 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Views/ProjectPage.xaml
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Views/ProjectPage.xaml
@@ -67,8 +67,9 @@
 								<Grid>
 									<TextBlock Text="{Binding Project.Description}" 
                                                Foreground="#333333" 
-                                               Style="{StaticResource BodyTextBlockStyle}"
-											   VerticalAlignment="Center"
+											   FontSize="15"
+											   TextWrapping="Wrap"
+											   Padding="0 10 0 0"
 											   Visibility="{Binding IsEditMode, Converter={StaticResource NegatedBooleanToVisibilityConverter}}" />
 									<TextBox Text="{Binding Project.Description, Mode=TwoWay}" 
 											 Visibility="{Binding IsEditMode, Converter={StaticResource BooleanToVisibilityConverter}}" 
@@ -89,7 +90,10 @@
 									   Margin="0,8,8,8" 
 									   VerticalAlignment="Center" />
 							<TextBlock Text="{Binding Project.Author}" 
-									   Style="{StaticResource SubtitleTextBlockStyle}"
+									   FontSize="15"
+									   TextWrapping="NoWrap"
+									   TextTrimming="CharacterEllipsis"
+									   Padding="0 10 0 0"
 									   Margin="8" Foreground="#666666" Grid.Column="1"
 									   Visibility="{Binding IsEditMode, Converter={StaticResource NegatedBooleanToVisibilityConverter}}"/>
 							<TextBox Text="{Binding Project.Author, Mode=TwoWay}" Margin="8" Grid.Column="1"
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/BundleArtifacts/arm.txt b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/BundleArtifacts/arm.txt
new file mode 100644
index 0000000..c8fc5ca
--- /dev/null
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/BundleArtifacts/arm.txt
@@ -0,0 +1,4 @@
+MainPackage=C:\Users\Aleksandar\Documents\GitHub\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\bin\ARM\Release\SparkiyClient.Windows_1.2.0.2_ARM.appx
+SymbolPackage=C:\Users\Aleksandar\Documents\GitHub\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\AppPackages\SparkiyClient.Windows_1.2.0.2_Test\SparkiyClient.Windows_1.2.0.2_ARM.appxsym
+ResourcePack=C:\Users\Aleksandar\Documents\GitHub\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\bin\ARM\Release\SparkiyClient.Windows_1.2.0.2_scale-140.appx
+ResourcePack=C:\Users\Aleksandar\Documents\GitHub\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\bin\ARM\Release\SparkiyClient.Windows_1.2.0.2_scale-180.appx
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/BundleArtifacts/x64.txt b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/BundleArtifacts/x64.txt
new file mode 100644
index 0000000..8fa6ec7
--- /dev/null
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/BundleArtifacts/x64.txt
@@ -0,0 +1,2 @@
+MainPackage=C:\Users\Aleksandar\Documents\GitHub\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\bin\x64\Release\SparkiyClient.Windows_1.2.0.2_x64.appx
+SymbolPackage=C:\Users\Aleksandar\Documents\GitHub\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\AppPackages\SparkiyClient.Windows_1.2.0.2_Test\SparkiyClient.Windows_1.2.0.2_x64.appxsym
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/BundleArtifacts/x86.txt b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/BundleArtifacts/x86.txt
new file mode 100644
index 0000000..6c08dd7
--- /dev/null
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/BundleArtifacts/x86.txt
@@ -0,0 +1,2 @@
+MainPackage=C:\Users\Aleksandar\Documents\GitHub\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\bin\x86\Release\SparkiyClient.Windows_1.2.0.2_x86.appx
+SymbolPackage=C:\Users\Aleksandar\Documents\GitHub\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\AppPackages\SparkiyClient.Windows_1.2.0.2_Test\SparkiyClient.Windows_1.2.0.2_x86.appxsym
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Package.StoreAssociation.xml b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Package.StoreAssociation.xml
index dbfb0e9..e28e1ef 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Package.StoreAssociation.xml
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Package.StoreAssociation.xml
@@ -357,5 +357,33 @@
     <MainPackageIdentityName>53858AleksandarToplek.Project-Code</MainPackageIdentityName>
     <MainPackageIdentityName>53858AleksandarToplek.Quantastic</MainPackageIdentityName>
   </AccountPackageIdentityNames>
-  <PackageInfoList LandingUrl="https://appdev.microsoft.com:443/StorePortals/Developer/Catalog/ReleaseAnchor/b06800e1-6a95-4d7b-9feb-32a371613afd" />
+  <PackageInfoList LandingUrl="https://appdev.microsoft.com:443/StorePortals/Developer/Catalog/ReleaseAnchor/b06800e1-6a95-4d7b-9feb-32a371613afd">
+    <BundleInfo>
+      <PackageInfo>
+        <OsMinVersion>6.3.0.0</OsMinVersion>
+        <PackageArchitecture>X86</PackageArchitecture>
+        <PackageMaxArchitectureVersion>1.1.1.1</PackageMaxArchitectureVersion>
+      </PackageInfo>
+      <PackageInfo>
+        <OsMinVersion>6.3.0.0</OsMinVersion>
+        <PackageArchitecture>X64</PackageArchitecture>
+        <PackageMaxArchitectureVersion>1.1.1.1</PackageMaxArchitectureVersion>
+      </PackageInfo>
+      <PackageInfo>
+        <OsMinVersion>6.3.0.0</OsMinVersion>
+        <PackageArchitecture>Neutral</PackageArchitecture>
+        <PackageMaxArchitectureVersion>1.1.1.1</PackageMaxArchitectureVersion>
+      </PackageInfo>
+      <PackageInfo>
+        <OsMinVersion>6.3.0.0</OsMinVersion>
+        <PackageArchitecture>Neutral</PackageArchitecture>
+        <PackageMaxArchitectureVersion>1.1.1.1</PackageMaxArchitectureVersion>
+      </PackageInfo>
+      <PackageInfo>
+        <OsMinVersion>6.3.0.0</OsMinVersion>
+        <PackageArchitecture>ARM</PackageArchitecture>
+        <PackageMaxArchitectureVersion>1.1.1.1</PackageMaxArchitectureVersion>
+      </PackageInfo>
+    </BundleInfo>
+  </PackageInfoList>
 </StoreAssociation>
\ No newline at end of file
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Package.appxmanifest b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Package.appxmanifest
index aa72b49..4bc03ac 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Package.appxmanifest
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest">
-  <Identity Name="53858AleksandarToplek.Sparkiy" Publisher="CN=E746B84B-09A1-43E8-B524-41758B02DFE1" Version="1.1.1.0" />
+  <Identity Name="53858AleksandarToplek.Sparkiy" Publisher="CN=E746B84B-09A1-43E8-B524-41758B02DFE1" Version="1.3.0.0" />
   <Properties>
     <DisplayName>Sparkiy</DisplayName>
     <PublisherDisplayName>Aleksandar Toplek</PublisherDisplayName>
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/SparkiyClient.Windows.csproj b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/SparkiyClient.Windows.csproj
index 27ee953..b4a64cd 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/SparkiyClient.Windows.csproj
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/SparkiyClient.Windows.csproj
@@ -22,6 +22,7 @@
     <NuGetPackageImportStamp>60303db4</NuGetPackageImportStamp>
     <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
     <AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
+    <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>x86</PlatformTarget>
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/DebugPage.xaml b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/DebugPage.xaml
index a3d5b1c..d6dfdfb 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/DebugPage.xaml
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/DebugPage.xaml
@@ -11,10 +11,18 @@
     xmlns:engine="using:SparkiyEngine.Bindings.Component.Engine"
     xmlns:playbackControls="using:SparkiyClient.Controls.PlaybackControls"
     xmlns:controls="using:SparkiyClient.Controls"
+    xmlns:converters="using:SparkiyClient.Converters"
     mc:Ignorable="d"
 	RequestedTheme="Light"
 	DataContext="{Binding Source={StaticResource Locator}, Path=DebugPage}">
 	
+	<common:PageBase.Resources>
+		<SolidColorBrush Color="#444" x:Key="NormalMessageForegroundBrush" />
+		<SolidColorBrush Color="OrangeRed" x:Key="ErrorMessageForegroundBrush" />
+		
+		<converters:BooleanToBrushConverter x:Key="BooleanToBrushConverterMessages" TrueBrush="{StaticResource ErrorMessageForegroundBrush}" FalseBrush="{StaticResource NormalMessageForegroundBrush}" />
+	</common:PageBase.Resources>
+	
 	<common:PageBase.TopAppBar>
 		<AppBar RequestedTheme="Dark" Background="#111">
 			<controls:TopNavigationControl Header="{Binding Project.Name, Converter={StaticResource StringFormatConverter}, ConverterParameter=\{0\}\ \-\ Editor}" 
@@ -78,7 +86,7 @@
 											   FontSize="16"
 											   TextWrapping="Wrap" 
 											   Padding="8 10 2 10"
-											   Foreground="#444"/>
+											   Foreground="{Binding IsError, Converter={StaticResource BooleanToBrushConverterMessages}}" />
 								</Grid>
 							</DataTemplate>
 						</ListView.ItemTemplate>
diff --git a/SparkiyClient/SparkiyEngine.Bindings.Component/Engine/EngineMessage.cs b/SparkiyClient/SparkiyEngine.Bindings.Component/Engine/EngineMessage.cs
index 42a4510..91ad75e 100644
--- a/SparkiyClient/SparkiyEngine.Bindings.Component/Engine/EngineMessage.cs
+++ b/SparkiyClient/SparkiyEngine.Bindings.Component/Engine/EngineMessage.cs
@@ -10,6 +10,8 @@ public sealed class EngineMessage
 
 		public BindingTypes SourceType { get; set; }
 
+		public bool IsError { get; set; }
+
 
 		public override string ToString()
 		{
diff --git a/SparkiyClient/SparkiyEngine.Bindings.Component/Engine/IEngineBindings.cs b/SparkiyClient/SparkiyEngine.Bindings.Component/Engine/IEngineBindings.cs
index d2aa24c..8e7350c 100644
--- a/SparkiyClient/SparkiyEngine.Bindings.Component/Engine/IEngineBindings.cs
+++ b/SparkiyClient/SparkiyEngine.Bindings.Component/Engine/IEngineBindings.cs
@@ -74,7 +74,7 @@ public interface IEngineBindings : IBindingsBase
 
         #region Scripts
 
-	    void AddScript(string name, string code);
+	    bool AddScript(string name, string code);
 
         #endregion Scripts
 
diff --git a/SparkiyClient/SparkiyEngine.Bindings.Component/Language/ILanguageBindings.cs b/SparkiyClient/SparkiyEngine.Bindings.Component/Language/ILanguageBindings.cs
index 763dfc2..a0b3caa 100644
--- a/SparkiyClient/SparkiyEngine.Bindings.Component/Language/ILanguageBindings.cs
+++ b/SparkiyClient/SparkiyEngine.Bindings.Component/Language/ILanguageBindings.cs
@@ -25,7 +25,7 @@ public interface ILanguageBindings : IBindingsBase
 		//
 		// Scripts
 		// 
-	    void LoadScript(string id, string content);
+	    bool LoadScript(string id, string content);
 	    void StartScript(string id);
 
 		// 
@@ -33,6 +33,11 @@ public interface ILanguageBindings : IBindingsBase
 		//
 		void Reset();
 
+		//
+		// Error
+		//
+		LanguageScriptError GetError();
+
         /// <summary>
         /// Gets the language that is implemented with this instance of bindings.
         /// </summary>
diff --git a/SparkiyClient/SparkiyEngine.Bindings.Component/Language/LanguageScriptError.cs b/SparkiyClient/SparkiyEngine.Bindings.Component/Language/LanguageScriptError.cs
new file mode 100644
index 0000000..61d79c7
--- /dev/null
+++ b/SparkiyClient/SparkiyEngine.Bindings.Component/Language/LanguageScriptError.cs
@@ -0,0 +1,8 @@
+namespace SparkiyEngine.Bindings.Component.Language
+{
+	public sealed class LanguageScriptError
+	{
+		public string ScriptId { get; set; }
+		public string Message { get; set; }
+	}
+}
\ No newline at end of file
diff --git a/SparkiyClient/SparkiyEngine.Bindings.Component/SparkiyEngine.Bindings.Component.csproj b/SparkiyClient/SparkiyEngine.Bindings.Component/SparkiyEngine.Bindings.Component.csproj
index 6540ca1..802a33f 100644
--- a/SparkiyClient/SparkiyEngine.Bindings.Component/SparkiyEngine.Bindings.Component.csproj
+++ b/SparkiyClient/SparkiyEngine.Bindings.Component/SparkiyEngine.Bindings.Component.csproj
@@ -79,6 +79,7 @@
     <Compile Include="Graphics\IGraphicsStyleBindings.cs" />
     <Compile Include="Graphics\MethodCallRequestEventHandler.cs" />
     <Compile Include="Language\ILanguageBindings.cs" />
+    <Compile Include="Language\LanguageScriptError.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
@@ -89,4 +90,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/SparkiyClient/SparkiyEngine.Engine/Sparkiy.cs b/SparkiyClient/SparkiyEngine.Engine/Sparkiy.cs
index b51b7c3..13dfdfd 100644
--- a/SparkiyClient/SparkiyEngine.Engine/Sparkiy.cs
+++ b/SparkiyClient/SparkiyEngine.Engine/Sparkiy.cs
@@ -135,15 +135,37 @@ public void Pause()
             this.CallStopped();
 	    }
 
-	    public void AddScript(string name, string code)
+	    public bool AddScript(string name, string code)
 	    {
 			Contract.Requires(!String.IsNullOrWhiteSpace(name));
 
 			Log.Debug("Added script \"{0}\"", name);
 
 	        this.scriptManager.AddScript(name);
-	        this.LanguageBindings.LoadScript(name, code ?? String.Empty);
-            this.CallCreated(name);
+		    try
+		    {
+			    bool isLoaded = this.LanguageBindings.LoadScript(name, code ?? String.Empty);
+				if (!isLoaded)
+					throw new Exception();
+
+				this.CallCreated(name);
+
+			    return true;
+		    }
+		    catch (Exception ex)
+		    {
+				this.AddMessage(new EngineMessage()
+				{
+					Message = this.LanguageBindings.GetError().Message,
+					Source = this.LanguageBindings,
+					SourceType = BindingTypes.Language,
+					IsError = true
+				});
+
+				this.Reset();
+			}
+
+		    return false;
 	    }
 
 	    public void CallDrawFunction()
@@ -173,15 +195,15 @@ public void CallDrawFunction()
 	            this.pointerManager.PrimaryPointer.UpdateType();
 	        }
 
-            // Call use draw method
-            this.LanguageBindings.CallMethod("Draw", new MethodDeclarationOverloadDetails() {Type = MethodTypes.Call}, new object[] {});
+			// Call use draw method
+			this.CallFunction(null, "Draw", MethodTypes.Call);
 	    }
 
-	    private void CallCreated(string script = null)
+	    private void CallCreated(string script)
 	    {
 		    this.AddMessage(new EngineMessage()
 		    {
-			    Message = "Script \"" + script + "\": Created",
+			    Message = "Script \"" + script + "\" created",
 			    SourceType = BindingTypes.Engine,
 			    Source = this
 		    });
@@ -191,7 +213,14 @@ private void CallCreated(string script = null)
 
 	    private void CallStarted(string script = null)
 	    {
-	        this.CallFunction(script, "Started", MethodTypes.Call);
+			this.AddMessage(new EngineMessage()
+			{
+				Message = script == null ? "All scripts started" : "Script \"" + script + "\" started",
+				SourceType = BindingTypes.Engine,
+				Source = this
+			});
+
+			this.CallFunction(script, "Started", MethodTypes.Call);
 	    }
 
         private void CallTouched(InputTypes type, float x, float y, string script = null)
@@ -206,31 +235,55 @@ private void CallTouched(InputTypes type, float x, float y, string script = null
 
 	    private void CallStopped(string script = null)
 	    {
-	        this.CallFunction(script, "Stopped", MethodTypes.Call);
+			this.AddMessage(new EngineMessage()
+			{
+				Message = script == null ? "All scripts stopped" : "Script \"" + script + "\" stopped",
+				SourceType = BindingTypes.Engine,
+				Source = this
+			});
+
+			this.CallFunction(script, "Stopped", MethodTypes.Call);
 	    }
 
-	    private object CallFunction(string script, string name, MethodTypes type, Dictionary<object, DataTypes> inputParameters = null)
+	    public object CallFunction(string script, string name, MethodTypes type, Dictionary<object, DataTypes> inputParameters = null)
 	    {
-	        if (script != null)
-	        {
-                return this.LanguageBindings.CallMethod(script, name,
-                    new MethodDeclarationOverloadDetails()
-                    {
-                        Type = type,
-                        Input = inputParameters?.Values.ToArray() ?? new DataTypes[0]
-                    },
-                    inputParameters?.Keys.ToArray() ?? new object[0]);
-            }
-	        else
-	        {
-	            return this.LanguageBindings.CallMethod(name,
-	                new MethodDeclarationOverloadDetails()
-	                {
-	                    Type = type,
-	                    Input = inputParameters?.Values.ToArray() ?? new DataTypes[0]
-	                },
-	                inputParameters?.Keys.ToArray() ?? new object[0]);
-	        }
+		    try
+		    {
+			    if (script != null)
+			    {
+				    return this.LanguageBindings.CallMethod(script, name,
+					    new MethodDeclarationOverloadDetails()
+					    {
+						    Type = type,
+						    Input = inputParameters?.Values.ToArray() ?? new DataTypes[0]
+					    },
+					    inputParameters?.Keys.ToArray() ?? new object[0]);
+			    }
+			    else
+			    {
+				    return this.LanguageBindings.CallMethod(name,
+					    new MethodDeclarationOverloadDetails()
+					    {
+						    Type = type,
+						    Input = inputParameters?.Values.ToArray() ?? new DataTypes[0]
+					    },
+					    inputParameters?.Keys.ToArray() ?? new object[0]);
+			    }
+		    }
+		    catch (Exception ex)
+		    {
+				this.Reset();
+
+				this.AddMessage(new EngineMessage()
+				{
+					Message = this.LanguageBindings.GetError().Message,
+					Source = this,
+					SourceType = BindingTypes.Engine,
+					IsError = true
+				});
+
+			    return null;
+		    }
 	    }
 
 	    #region Messages
@@ -303,9 +356,6 @@ public void Reset()
 			this.LanguageBindings.Reset();
 			this.GraphicsBindings.Reset();
 
-			// Clear engine
-			this.ClearMessages();
-
             // Clear scripts
 		    this.scriptManager.Reset();
 
diff --git a/SparkiyClient/SparkiyEngine.Graphics.DirectX/SparkiyGame.cs b/SparkiyClient/SparkiyEngine.Graphics.DirectX/SparkiyGame.cs
index 3f3e4ff..5205b6a 100644
--- a/SparkiyClient/SparkiyEngine.Graphics.DirectX/SparkiyGame.cs
+++ b/SparkiyClient/SparkiyEngine.Graphics.DirectX/SparkiyGame.cs
@@ -272,25 +272,18 @@ public void DrawTexture(string assetName, float x, float y, float width = -1f, f
 
 		protected override void Draw(GameTime gameTime)
 		{
-		    if (!isPlaying) return;
-
-			base.Draw(gameTime);
+		    base.Draw(gameTime);
 
 			// Clears the screen with the Color.CornflowerBlue
 			this.GraphicsDevice.Clear(this.BackgroundColor);
 
-			// Draw 2D
-			this.Reset();
-			//this.Canvas.Render();
-
-			// Execute users draw loop
-			try
-			{
-			    this.engine.CallDrawFunction();
-			}
-			catch(Exception ex)
+			if (this.isPlaying)
 			{
-				this.StoppedByException(ex);
+				// Draw 2D
+				this.Reset();
+
+				// Execute users draw loop
+				this.engine.CallDrawFunction();
 			}
 
 			this.Canvas.Render();
@@ -322,12 +315,6 @@ public void Reset()
             this.engine.LanguageBindings.SetVariable("HEIGHT", (double)this.GraphicsDevice.Viewport.Height, DataTypes.Number);
         }
 
-		private void StoppedByException(Exception ex)
-		{
-			this.Pause();
-            this.Reset();
-        }
-
 		#region Surface
 
 		public Color4 BackgroundColor
diff --git a/SparkiyClient/SparkiyEngine.Language.LuaImplementation/SparkiyEngine.Language.LuaImplementation.Shared/LanguageBindings.cpp b/SparkiyClient/SparkiyEngine.Language.LuaImplementation/SparkiyEngine.Language.LuaImplementation.Shared/LanguageBindings.cpp
index a076797..3ec8b60 100644
--- a/SparkiyClient/SparkiyEngine.Language.LuaImplementation/SparkiyEngine.Language.LuaImplementation.Shared/LanguageBindings.cpp
+++ b/SparkiyClient/SparkiyEngine.Language.LuaImplementation/SparkiyEngine.Language.LuaImplementation.Shared/LanguageBindings.cpp
@@ -75,7 +75,7 @@ void LanguageBindings::SetVariable(String^ name, Object^ value, SparkiyEngine::B
 //
 // LoadScript
 //
-void LanguageBindings::LoadScript(String ^id, String ^content)
+bool LanguageBindings::LoadScript(String ^id, String ^content)
 {
 	// Convert to C compatible strings
 	const char *cId = GetCString(id);
@@ -94,13 +94,15 @@ void LanguageBindings::LoadScript(String ^id, String ^content)
 	});
 
 	// Load content to the script
-	script->Load();
+	auto isValid = script->Load();
 
 	// Add to the scripts list
 	this->m_luaImpl->AddScript(cId, script);
 
 	// mark that binding loaded at least one script
 	this->m_didLoadScript = true;
+
+	return isValid;
 }
 
 // 
@@ -126,6 +128,14 @@ void LanguageBindings::Reset()
 	this->m_luaImpl->Reset();
 }
 
+//
+// GetError
+//
+LanguageScriptError^ LanguageBindings::GetError() 
+{
+	return this->m_luaImpl->GetScriptError();
+}
+
 SupportedLanguages LanguageBindings::Language::get()
 {
 	return SupportedLanguages::Lua;
diff --git a/SparkiyClient/SparkiyEngine.Language.LuaImplementation/SparkiyEngine.Language.LuaImplementation.Shared/LanguageBindings.h b/SparkiyClient/SparkiyEngine.Language.LuaImplementation/SparkiyEngine.Language.LuaImplementation.Shared/LanguageBindings.h
index 914f257..7d0a024 100644
--- a/SparkiyClient/SparkiyEngine.Language.LuaImplementation/SparkiyEngine.Language.LuaImplementation.Shared/LanguageBindings.h
+++ b/SparkiyClient/SparkiyEngine.Language.LuaImplementation/SparkiyEngine.Language.LuaImplementation.Shared/LanguageBindings.h
@@ -12,7 +12,7 @@ namespace SparkiyEngine_Language_LuaImplementation
 	{
 	public:
 		virtual void MapToGraphicsMethods(IMapView<String ^, SparkiyEngine::Bindings::Component::Common::MethodDeclarationDetails ^> ^declarations);
-		virtual void LoadScript(String ^id, String ^content);
+		virtual bool LoadScript(String ^id, String ^content);
 		virtual void StartScript(String ^id);
 
 		// Methods
@@ -26,6 +26,10 @@ namespace SparkiyEngine_Language_LuaImplementation
 		// Settings
 		virtual void Reset();
 
+		// Error
+		virtual SparkiyEngine::Bindings::Component::Language::LanguageScriptError^ GetError();
+
+
 		virtual property SparkiyEngine::Bindings::Component::Common::SupportedLanguages Language
 		{
 			SparkiyEngine::Bindings::Component::Common::SupportedLanguages get();
diff --git a/SparkiyClient/SparkiyEngine.Language.LuaImplementation/SparkiyEngine.Language.LuaImplementation.Shared/LuaImplementation.cpp b/SparkiyClient/SparkiyEngine.Language.LuaImplementation/SparkiyEngine.Language.LuaImplementation.Shared/LuaImplementation.cpp
index a17cd32..80e0b7c 100644
--- a/SparkiyClient/SparkiyEngine.Language.LuaImplementation/SparkiyEngine.Language.LuaImplementation.Shared/LuaImplementation.cpp
+++ b/SparkiyClient/SparkiyEngine.Language.LuaImplementation/SparkiyEngine.Language.LuaImplementation.Shared/LuaImplementation.cpp
@@ -138,3 +138,21 @@ void LuaImplementation::Reset()
 
 	this->m_scripts.clear();
 }
+
+//
+// ScriptError
+//
+void LuaImplementation::ScriptError(const char* scriptId, const char* message) 
+{
+	this->m_scriptError = ref new LanguageScriptError();
+	this->m_scriptError->ScriptId = GetPString(scriptId);
+	this->m_scriptError->Message = GetPString(message);
+}
+
+//
+// GetScriptError
+//
+LanguageScriptError^ LuaImplementation::GetScriptError()
+{
+	return this->m_scriptError;
+}
diff --git a/SparkiyClient/SparkiyEngine.Language.LuaImplementation/SparkiyEngine.Language.LuaImplementation.Shared/LuaImplementation.h b/SparkiyClient/SparkiyEngine.Language.LuaImplementation/SparkiyEngine.Language.LuaImplementation.Shared/LuaImplementation.h
index 9a6e539..ee36d03 100644
--- a/SparkiyClient/SparkiyEngine.Language.LuaImplementation/SparkiyEngine.Language.LuaImplementation.Shared/LuaImplementation.h
+++ b/SparkiyClient/SparkiyEngine.Language.LuaImplementation/SparkiyEngine.Language.LuaImplementation.Shared/LuaImplementation.h
@@ -27,10 +27,13 @@ namespace SparkiyEngine_Language_LuaImplementation
 		void SetConstant(const char *name, Platform::Object^ value, SparkiyEngine::Bindings::Component::Common::DataTypes dataType);
 		void SetVariable(const char *name, Platform::Object^ value, SparkiyEngine::Bindings::Component::Common::DataTypes dataType);
 
-		std::map<const char *, SparkiyEngine::Bindings::Component::Common::MethodDeclarationDetails ^, StrCompare>				 m_declarations;
+		std::map<const char *, SparkiyEngine::Bindings::Component::Common::MethodDeclarationDetails ^, StrCompare>	 m_declarations;
 
 		void Reset();
 
+		void ScriptError(const char* scriptId, const char* message);
+		SparkiyEngine::Bindings::Component::Language::LanguageScriptError^ GetScriptError();
+
 	private:
 		void Initialize();
 
@@ -38,5 +41,6 @@ namespace SparkiyEngine_Language_LuaImplementation
 		SparkiyEngine::Bindings::Component::Engine::IEngineBindings													^m_engine;
 		SparkiyEngine::Bindings::Component::Language::ILanguageBindings												^m_languageBindings;
 		std::map<const char *, LuaScript *, StrCompare>																 m_scripts;
+		SparkiyEngine::Bindings::Component::Language::LanguageScriptError											^m_scriptError;
 	};
 }
diff --git a/SparkiyClient/SparkiyEngine.Language.LuaImplementation/SparkiyEngine.Language.LuaImplementation.Shared/LuaScript.cpp b/SparkiyClient/SparkiyEngine.Language.LuaImplementation/SparkiyEngine.Language.LuaImplementation.Shared/LuaScript.cpp
index 9f6ba64..5b584a3 100644
--- a/SparkiyClient/SparkiyEngine.Language.LuaImplementation/SparkiyEngine.Language.LuaImplementation.Shared/LuaScript.cpp
+++ b/SparkiyClient/SparkiyEngine.Language.LuaImplementation/SparkiyEngine.Language.LuaImplementation.Shared/LuaScript.cpp
@@ -51,16 +51,6 @@ void LuaScript::RegisterMethod(MethodDeclarationDetails ^declaration)
 	this->RegisterFunction(cName, UniversalFunction);
 }
 
-//
-// Start
-//
-void LuaScript::Start()
-{
-	OutputDebugStringW(GetWString("Starting script with id(" + GetString(this->m_id) + ")\n").c_str());
-
-	this->m_isRunning = true;
-}
-
 // 
 // RegisterFunction
 //
@@ -71,12 +61,20 @@ void LuaScript::RegisterFunction(const char *name, FunctionPointer pt)
 	lua_setglobal(this->m_luaState, name);
 }
 
-// 
-// RegisterLibrary
 //
-void LuaScript::RegisterLibrary(const char *name, const luaL_Reg *functions) {
-	luaL_newlib(this->m_luaState, functions);
-	lua_setglobal(this->m_luaState, name);
+// Start
+//
+void LuaScript::Start()
+{
+	if (!this->m_isValid) 
+	{
+		luaL_error(this->m_luaState, "Can't start invalid script");
+		return;
+	}
+
+	OutputDebugStringW(GetWString("Starting script with id(" + GetString(this->m_id) + ")\n").c_str());
+
+	this->m_isRunning = true;
 }
 
 //
@@ -94,27 +92,45 @@ const char* LuaScript::GetErrorMessage()
 //
 void LuaScript::HandleException() 
 {
+	this->m_isValid = false;
+	throw;
+}
+
+//
+// HandleError
+//
+void LuaScript::HandleError() 
+{
+	this->m_isValid = false;
 	auto errorMessage = this->GetErrorMessage();
-	this->m_luaImpl->CreateMessage("Error: " + GetString(errorMessage) + "\n");
+	this->m_luaImpl->ScriptError(this->m_id, errorMessage);
 }
 
 //
 // Load
 //
-void LuaScript::Load()
+bool LuaScript::Load()
 {
 	try 
 	{
 		// Run the script
 		this->m_isValid = luaL_dostring(m_luaState, this->m_content) == LUA_OK;
 
-		if (!this->m_isValid)
-			this->HandleException();
+		if (!this->m_isValid) 
+		{
+			this->HandleError();
+			return false;
+		}
+
+		return true;
 	}
 	catch (...) 
 	{
+		// This should not happen
 		this->HandleException();
 	}
+
+	return false;
 }
 
 //
@@ -303,6 +319,9 @@ LuaScript* LuaScript::GetCallerScript(lua_State *luaState) {
 //
 int LuaScript::PanicHandler(lua_State *luaState)
 {
+	auto callerScript = GetCallerScript(luaState);
+	auto message = callerScript->GetErrorMessage();
+	callerScript->m_luaImpl->ScriptError(callerScript->m_id, message);
 	throw;
 
 	// This should not be reached
@@ -318,17 +337,35 @@ bool LuaScript::FunctionExist(lua_State *luaState, const char *name) {
 }
 
 // static
-// CallFunction
+// HandleProtectedCallError
 //
-int LuaScript::CallFunction(lua_State *luaState, const char *name, int numParameters, int numResults) {
-	const char *functionExecutionError = "An error occured while executing function \"%s\"";
+void LuaScript::HandleProtectedCallError(lua_State *luaState, const char *name)
+{
+	const char *functionExecutionError = "%s:%s:%s";
+	auto callerScript = GetCallerScript(luaState);
+	auto message = callerScript->GetErrorMessage();
+	luaL_error(luaState, functionExecutionError, callerScript->m_id, name, message);
+}
 
-	lua_getglobal(luaState, name);
-	lua_insert(luaState, numParameters);
-	int errorCode = lua_pcall(luaState, numParameters, numResults, 0);
-	if (errorCode)
-		luaL_error(luaState, functionExecutionError, name);
+// static
+// CallFunction
+//
+bool LuaScript::CallFunction(lua_State *luaState, const char *name, int numParameters, int numResults) {
+	try 
+	{
+		lua_getglobal(luaState, name);
+		lua_insert(luaState, numParameters);
+		int errorCode = lua_pcall(luaState, numParameters, numResults, 0);
+		if (!errorCode)
+			return true;
+		else LuaScript::HandleProtectedCallError(luaState, name);
+	}
+	catch (Exception^ ex) 
+	{
+		// This should not happen
+		throw ref new Exception(0x81000001, "Exception in protected function call. This should not have happened. Resolve before exception is thrown." + ex->Message);
+	}
 
-	return errorCode;
+	return false;
 }
 
diff --git a/SparkiyClient/SparkiyEngine.Language.LuaImplementation/SparkiyEngine.Language.LuaImplementation.Shared/LuaScript.h b/SparkiyClient/SparkiyEngine.Language.LuaImplementation/SparkiyEngine.Language.LuaImplementation.Shared/LuaScript.h
index 3514bf2..1def30f 100644
--- a/SparkiyClient/SparkiyEngine.Language.LuaImplementation/SparkiyEngine.Language.LuaImplementation.Shared/LuaScript.h
+++ b/SparkiyClient/SparkiyEngine.Language.LuaImplementation/SparkiyEngine.Language.LuaImplementation.Shared/LuaScript.h
@@ -24,7 +24,7 @@ namespace SparkiyEngine_Language_LuaImplementation
 
 		Platform::Object^ CallMethod(const char *name, SparkiyEngine::Bindings::Component::Common::MethodDeclarationOverloadDetails^ declaration, const Platform::Array<Platform::Object^>^ paramValues);
 		void RegisterMethod(SparkiyEngine::Bindings::Component::Common::MethodDeclarationDetails ^declaration);
-		void Load();
+		bool Load();
 		void Start();
 
 		// Variables and Constants
@@ -33,8 +33,8 @@ namespace SparkiyEngine_Language_LuaImplementation
 
 	protected:
 		void RegisterFunction(const char *name, FunctionPointer pt);
-		void RegisterLibrary(const char *name, const luaL_Reg *functions);
 		const char* GetErrorMessage();
+		void HandleError();
 		void HandleException();
 
 		// Helper methods
@@ -45,7 +45,8 @@ namespace SparkiyEngine_Language_LuaImplementation
 		static LuaScript* GetCallerScript(lua_State *luaState);
 		static int PanicHandler(lua_State *luaState);
 		static bool FunctionExist(lua_State *luaState, const char *name);
-		static int CallFunction(lua_State *luaState, const char *name, int numParameters, int numResults);
+		static bool CallFunction(lua_State *luaState, const char *name, int numParameters, int numResults);
+		static void HandleProtectedCallError(lua_State *luaState, const char *name);
 
 	private:
 		// Script info