More defensive code
Merge branch 'master' of github.com:Dexels/navajo
Merge branch 'master' of github.com:Dexels/navajo