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