Guard against null pointer exceptions
Merge branch 'master' of https://github.com/pwrose/symmetry