npe fix
Merge branch 'master' into kevin