fixed issue with null pointers
Merge branch 'WorkingNewArch' of https://github.com/jaxoncreed/StarSpace into WorkingNewArch