Fix NPE
Merge branch 'master' of git@github.com:phototools/phototools.git