diff --git a/.gitignore b/.gitignore
index 4122dae..21eebae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,7 @@
 __history
 *backup*
 id
+.persistence
 experiment_runner/experiment_runner
 experiment_runner/Participant*/*
 experiment_runner/lib/x86_64-linux/*.lfm
\ No newline at end of file
diff --git a/experiment_designer/experiment_designer.lpi b/experiment_designer/experiment_designer.lpi
index a5f5de2..ce39433 100644
--- a/experiment_designer/experiment_designer.lpi
+++ b/experiment_designer/experiment_designer.lpi
@@ -8,7 +8,6 @@
       <Title Value="experiment_designer"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
-      <Icon Value="0"/>
     </General>
     <i18n>
       <EnableI18N LFM="False"/>
@@ -61,7 +60,7 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <OtherUnitFiles Value="../units;../../../units"/>
+      <OtherUnitFiles Value="../experiment_runner/units"/>
       <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Linking>
diff --git a/experiment_designer/form_main.pas b/experiment_designer/form_main.pas
index 2fbaf4f..9e7cd7f 100644
--- a/experiment_designer/form_main.pas
+++ b/experiment_designer/form_main.pas
@@ -983,10 +983,10 @@ procedure TFormDesigner.SetPropstorageFilename;
 var
   LRootPath : string;
 begin
-  if FExperiment.FileName = '' then
-    LRootPath := ExtractFilePath(Application.ExeName)
-  else
-    LRootPath := ExtractFilePath(FExperiment.FileName);
+  LRootPath := ExtractFilePath(Application.ExeName);
+  if Assigned(FExperiment) then
+    if FExperiment.FileName <> '' then
+      LRootPath := ExtractFilePath(FExperiment.FileName);
 
   {$IFDEF WINDOWS}
   XMLPropStorage.FileName := LRootPath+'persistence.xml';
diff --git a/experiment_designer/lib/x86_64-linux/experiment_designer.compiled b/experiment_designer/lib/x86_64-linux/experiment_designer.compiled
index 66c6f20..207274f 100644
--- a/experiment_designer/lib/x86_64-linux/experiment_designer.compiled
+++ b/experiment_designer/lib/x86_64-linux/experiment_designer.compiled
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <Compiler Value="/usr/bin/fpc" Date="1449313866"/>
-  <Params Value=" -MObjFPC -Scghi -Cg -O1 -g -gl -l -vewnhibq -Fi/home/rafael/git/stimulus_control/tests/lacs-matrix/experiment_designer/lib/x86_64-linux -Fl/opt/gnome/lib -Fu/home/rafael/git/stimulus_control/tests/lacs-matrix/units -Fu/home/rafael/git/stimulus_control/units -Fu/usr/share/lazarus/1.6.2/lcl/units/x86_64-linux/gtk2 -Fu/usr/share/lazarus/1.6.2/lcl/units/x86_64-linux -Fu/usr/share/lazarus/1.6.2/components/lazutils/lib/x86_64-linux -Fu/usr/share/lazarus/1.6.2/packager/units/x86_64-linux -Fu/home/rafael/git/stimulus_control/tests/lacs-matrix/experiment_designer/ -FU/home/rafael/git/stimulus_control/tests/lacs-matrix/experiment_designer/lib/x86_64-linux/ -dLCL -dLCLgtk2 experiment_designer.lpr"/>
+  <Params Value=" -MObjFPC -Scghi -Cg -O1 -g -gl -l -vewnhibq -Fi/home/rafael/git/sc_split/experiment_designer/lib/x86_64-linux -Fl/opt/gnome/lib -Fu/home/rafael/git/sc_split/experiment_runner/units -Fu/usr/share/lazarus/1.6.2/lcl/units/x86_64-linux/gtk2 -Fu/usr/share/lazarus/1.6.2/lcl/units/x86_64-linux -Fu/usr/share/lazarus/1.6.2/components/lazutils/lib/x86_64-linux -Fu/usr/share/lazarus/1.6.2/packager/units/x86_64-linux -Fu/home/rafael/git/sc_split/experiment_designer/ -FU/home/rafael/git/sc_split/experiment_designer/lib/x86_64-linux/ -dLCL -dLCLgtk2 experiment_designer.lpr"/>
 </CONFIG>
--
libgit2 0.21.2