diff --git a/.gitignore b/.gitignore
index ef6120ea3e..b83a1f6d2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1,18 @@
 *~
-PGPLOT/*
-fftw/*
-fftw/*
-fgsl/*
-gsl/*
-hdf5/* 
-lapack/*  
-lapack95/*  
-open_spacecharge/*
-openmpi/*
-plplot/*
-xraylib/*
-gnu_utilities_src/*
-packages/*
+PGPLOT
+fftw
+fftw
+fgsl
+gsl
+hdf5 
+lapack  
+lapack95  
+open_spacecharge
+openmpi
+plplot
+xraylib
+gnu_utilities_src
+packages
 
 # Jupyter notebooks
 .ipynb_checkpoints
diff --git a/tao/code/tao_lattice_calc.f90 b/tao/code/tao_lattice_calc.f90
index 7d9d4139f9..e714bb18c3 100644
--- a/tao/code/tao_lattice_calc.f90
+++ b/tao/code/tao_lattice_calc.f90
@@ -106,7 +106,7 @@ subroutine tao_lattice_calc (calc_ok, print_err)
       tao_branch => tao_lat%tao_branch(ib)
       tao_branch%spin_map_valid = .false.
       tao_branch%spin%valid = .false.
-      tao_branch%spin_ele(:)%valid = .false.
+      if (allocated(tao_branch%spin_ele)) tao_branch%spin_ele(:)%valid = .false.
 
       u%model%tao_branch(:)%plot_cache_valid = .false.
       u%design%tao_branch(:)%plot_cache_valid = .false.